diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 416d3c1c..952263f1 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -23,8 +23,6 @@
           <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
         </value>
       </option>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8a..b589d56e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 6b6f226f..406683f6 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -12,6 +12,7 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/commons" />
+            <option value="$PROJECT_DIR$/compat" />
             <option value="$PROJECT_DIR$/datasync" />
             <option value="$PROJECT_DIR$/maps" />
             <option value="$PROJECT_DIR$/mountpoint" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 00000000..2b8a50fc
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.8.0" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf8d26a5..1274c79c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,127 @@
 # Changelog
 
+## [2.6.0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.6.0) (2023-05-08, release)
+
+### 🚀 Nouveautés
+
+* Support Android 13 (API 33).
+* Support des fonds Geoportail (https://github.com/PnX-SI/gn_mobile_maps/issues/8).
+  Le module ["maps"](https://github.com/PnX-SI/gn_mobile_maps/tree/develop/maps) supporte
+  officiellement les fonds suivants :
+  * [Geoportail WMTS](https://www.geoportail.gouv.fr)
+  * [OpenTopoMap](https://www.opentopomap.org)
+  * [OpenStreetMap](https://www.openstreetmap.org)
+  * [Wikimedia Maps](https://maps.wikimedia.org)
+* Gestion automatique des attributions sur les fonds en ligne (https://github.com/PnX-SI/gn_mobile_occtax/issues/191).
+  L'attribution est définie automatiquement selon la nature de la source si aucune n'a été précisée
+  dans la configuration. L'attribution n'est valable que pour les fonds en ligne.
+* Petites améliorations sur la documentation, notamment sur la gestion, la configuration et
+    l'ordonnancement des couches coté module ["maps"](https://github.com/PnX-SI/gn_mobile_maps/tree/develop/maps)
+    (https://github.com/PnX-SI/gn_mobile_occtax/issues/192)
+* La synchronisation périodique de l'ensemble des données issues de GeoNature est configuré par
+    défaut à 7 jours. Cette configuration n'est active uniquement que si la synchronisation périodique
+    n'est pas configurée (les paramètres `sync_periodicity_data` et `sync_periodicity_data_essential`
+    ne sont pas renseignés).
+* La synchronisation des données est maintenant décoléré de la synchronisation des relevés (https://github.com/PnX-SI/gn_mobile_occtax/issues/133).
+* La synchronisation des relevés se fait à la demande de l'utilisateur (https://github.com/PnX-SI/gn_mobile_occtax/issues/137).
+* La synchronisation des données s'exécute mantenant dans un contexte transactionnel afin de
+  toujours garantir une cohérence des données présentes localement.
+* Refonte de l'écran d'accueil pour mettre en valeur les relevés en cours ou prêt à être
+  synchronisés. La partie paramétrage et synchronisation des données sont déportées dans le menu
+  latéral.
+
+### 🐛 Corrections
+
+* Meilleur support de la taille des textes de l'interface selon la densité et la configuration
+  d'affichage du terminal (https://github.com/PnX-SI/gn_mobile_occtax/issues/217).
+
+### ⚠️ Notes de version
+
+* Code de version : 3200
+* Depuis sa version 2.12.0, GeoNature permet de gérer le contenu de la table
+  `gn_commons.t_mobile_apps` directement dans le backoffice du module "Admin" de GeoNature (https://github.com/PnX-SI/gn_mobile_occtax/issues/214)
+* Dans cette même version, les médias (incluant le dossier `mobile/` comprenant les fichiers APK et
+  le fichier `settings.json` d'Occtax-mobile) ont été déplacés du dossier `~/geonature/backend/static/`
+  à `~/geonature/backend/media/` (https://github.com/PnX-SI/gn_mobile_occtax/issues/214)
+
+## [2.6.0-rc2](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.6.0-rc2) (2023-04-29, pre-release)
+
+### 🚀 Nouveautés
+
+* La synchronisation périodique de l'ensemble des données issues de GeoNature est configuré par
+  défaut à 7 jours. Cette configuration n'est active uniquement que si la synchronisation périodique
+  n'est pas configurée (les paramètres `sync_periodicity_data` et `sync_periodicity_data_essential`
+  ne sont pas renseignés).
+
+### 🐛 Corrections
+
+* Meilleur support de la taille des textes de l'interface selon la densité et la configuration
+  d'affichage du terminal (https://github.com/PnX-SI/gn_mobile_occtax/issues/217).
+* Le bouton "Envoyer les relevés" présenté sous forme de bouton icône dans la barre de menu en page
+  d'accueil est affiché sous forme de texte simple "Envoyer" et non plus sous forme d'icône pour
+  plus de clarté.
+* Petites améliorations sur la documentation, notamment sur la gestion, la configuration et
+  l'ordonnancement des couches coté module ["maps"](https://github.com/PnX-SI/gn_mobile_maps/tree/develop/maps)
+  (https://github.com/PnX-SI/gn_mobile_occtax/issues/192).
+
+### ⚠️ Notes de version
+
+* Code de version : 3191
+
+## [2.6.0-rc1](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.6.0-rc1) (2023-04-19, pre-release)
+
+### 🚀 Nouveautés
+
+* Support Android 13 (API 33).
+* Support des fonds Geoportail (https://github.com/PnX-SI/gn_mobile_maps/issues/8).
+  Le module ["maps"](https://github.com/PnX-SI/gn_mobile_maps/tree/develop/maps) supporte
+  officiellement les fonds suivants :
+  * [Geoportail WMTS](https://www.geoportail.gouv.fr)
+  * [OpenTopoMap](https://www.opentopomap.org)
+  * [OpenStreetMap](https://www.openstreetmap.org)
+  * [Wikimedia Maps](https://maps.wikimedia.org)
+* Gestion automatique des attributions sur les fonds en ligne (https://github.com/PnX-SI/gn_mobile_occtax/issues/191).
+  L'attribution est définie automatiquement selon la nature de la source si aucune n'a été précisée
+  dans la configuration. L'attribution n'est valable que pour les fonds en ligne.
+* Petites améliorations sur la documentation, notamment sur la gestion des couches coté module
+  ["maps"](https://github.com/PnX-SI/gn_mobile_maps/tree/develop/maps) (https://github.com/PnX-SI/gn_mobile_occtax/issues/192).
+
+### 🐛 Corrections
+
+* Mise à jour de la liste des relevés et de leurs statuts pendant la synchronisation.
+
+### ⚠️ Notes de version
+
+* Code de version : 3187
+
+## [2.6.0-rc0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.6.0-rc0) (2023-03-25, pre-release)
+
+### 🚀 Nouveautés
+
+* La synchronisation des données est maintenant décoléré de la synchronisation des relevés (https://github.com/PnX-SI/gn_mobile_occtax/issues/133). 
+* La synchronisation des relevés se fait à la demande de l'utilisateur (https://github.com/PnX-SI/gn_mobile_occtax/issues/137).
+* La synchronisation des données s'exécute mantenant dans un contexte transactionnel afin de
+  toujours garantir une cohérence des données présentes localement.
+* Refonte de l'écran d'accueil pour mettre en valeur les relevés en cours ou prêt à être
+  synchronisés. La partie paramétrage et synchronisation des données sont déportées dans le menu
+  latéral.
+
+### ⚠️ Notes de version
+
+* Code de version : 3181
+
 ## [2.5.0](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.5.0) (2023-03-21, release)
 
 ### 🚀 Nouveautés
 
 * Gestion des médias sur la partie dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/84)
-* Refonte de la synchronisation des relevés en consommant les nouvelles APIs du module "Occtax".
+* Refonte de la synchronisation des relevés en consommant les APIs v2 du module "Occtax".
 * Refonte de la gestion des relevés.
 * Accélérer la saisie en permettant de mémoriser les dernières nomenclatures saisies sur la partie
   dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/169).
 * Possibilité de reprendre en édition un relevé terminé prêt à être synchronisé (https://github.com/PnX-SI/gn_mobile_occtax/issues/78).
 
-### 🚀 Corrections
+### 🐛 Corrections
 
 * Valeur par défaut des champs "Min"et "Max" dans la partie dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/209, https://github.com/PnX-SI/gn_mobile_occtax/issues/210)
 * Quelques petits ajustements sur la documentation de l'installation, notamment sur la récupération
@@ -20,13 +130,14 @@
 ### ⚠️ Notes de version
 
 * Code de version : 3170
+* Nécessite la version 2.10 (ou plus) de GeoNature.
 * Suite à la refonte sur la partie gestion des relevés, le paramétrage de la nomenclature en
   configuration avancée a évolué aussi (cf. [README.md](https://github.com/PnX-SI/gn_mobile_occtax#nomenclature-settings)),
   notamment sur le nommage des attributs et du respect de la casse (Par exemple `MIN` devient `count_min`).
 
 ## [2.4.1-rc4](https://github.com/PnX-SI/gn_mobile_occtax/releases/tag/2.4.1-rc4) (2023-02-21, pre-release)
 
-### 🚀 Corrections
+### 🐛 Corrections
 
 * Gestion des médias sur la partie dénombrement (https://github.com/PnX-SI/gn_mobile_occtax/issues/84)
 * Accélérer la saisie en permettant de mémoriser les dernières nomenclatures saisies sur la partie
diff --git a/README.md b/README.md
index eaba8929..11815412 100644
--- a/README.md
+++ b/README.md
@@ -50,19 +50,36 @@ Example:
     "base_path": "Offline_maps",
     "layers": [
       {
-        "source": "plan.mbtiles",
-        "label": "IGN plan"
+        "label": "IGN: plan v2",
+        "source": "https://wxs.ign.fr/essentiels/geoportail/wmts?REQUEST=GetTile&SERVICE=WMTS&VERSION=1.0.0&STYLE=normal&TILEMATRIXSET=PM&FORMAT=image/png&LAYER=GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2"
       },
       {
-        "source": "ortho.mbtiles",
-        "label": "IGN ortho"
+        "label": "IGN: ortho",
+        "source": "https://wxs.ign.fr/ortho/geoportail/wmts?REQUEST=GetTile&SERVICE=WMTS&VERSION=1.0.0&STYLE=normal&TILEMATRIXSET=PM&FORMAT=image/jpeg&LAYER=ORTHOIMAGERY.ORTHOPHOTOS"
       },
       {
         "label": "OpenStreetMap",
-        "source": "https://a.tile.openstreetmap.org/",
-        "properties": {
-          "attribution": "© OSM contributors"
-        }
+        "source": [
+          "https://a.tile.openstreetmap.org",
+          "https://b.tile.openstreetmap.org",
+          "https://c.tile.openstreetmap.org"
+        ]
+      },
+      {
+        "label": "OpenTopoMap",
+        "source": [
+          "https://a.tile.opentopomap.org",
+          "https://b.tile.opentopomap.org",
+          "https://c.tile.opentopomap.org"
+        ]
+      },
+      {
+        "label": "IGN plan",
+        "source": "plan.mbtiles"
+      },
+      {
+        "label": "IGN ortho",
+        "source": "ortho.mbtiles"
       },
       {
         "label": "Mailles 5x5",
@@ -252,10 +269,11 @@ Each property may be a simple string representing the nomenclature attribute to
 
 ## Upgrade git sub modules
 
-Do **NOT** modify directly any git sub modules (e.g. `commons`, `mountpoint`, `viewpager` and `maps`).
-Any changes should be made from each underlying git repository:
+Do **NOT** modify directly any git sub modules (e.g. `commons`, `compat`, `mountpoint`, `viewpager`
+and `maps`). Any changes should be made from each underlying git repository:
 
 - `commons`: [gn_mobile_core](https://github.com/PnX-SI/gn_mobile_core) git repository
+- `compat`: [gn_mobile_core](https://github.com/PnX-SI/gn_mobile_core) git repository
 - `datasync`: [gn_mobile_core](https://github.com/PnX-SI/gn_mobile_core) git repository
 - `mountpoint`: [gn_mobile_core](https://github.com/PnX-SI/gn_mobile_core) git repository
 - `viewpager`: [gn_mobile_core](https://github.com/PnX-SI/gn_mobile_core) git repository
diff --git a/build.gradle b/build.gradle
index 2bb3477f..cea15c3d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.6.21'
+    ext.klint_version = '11.3.1'
+    ext.kotlin_version = '1.8.0'
     ext.androidx_hilt_version = '1.0.0'
-    ext.hilt_version = '2.41'
+    ext.hilt_version = '2.44'
     ext.retrofit_version = '2.9.0'
+    ext.room_version = '2.5.1'
     ext.tinylog_version = '2.4.1'
 
     repositories {
@@ -16,13 +18,17 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
-        classpath "org.jlleitschuh.gradle:ktlint-gradle:9.4.1"
     }
 }
 
+plugins {
+    id 'com.google.dagger.hilt.android' version "$hilt_version" apply false
+    id 'org.jlleitschuh.gradle.ktlint' version "$klint_version"
+    id 'org.jlleitschuh.gradle.ktlint-idea' version "$klint_version"
+}
+
 allprojects {
     repositories {
         google()
diff --git a/compat b/compat
new file mode 120000
index 00000000..d45d8c08
--- /dev/null
+++ b/compat
@@ -0,0 +1 @@
+gn_mobile_core/compat
\ No newline at end of file
diff --git a/docs/installation-fr.adoc b/docs/installation-fr.adoc
index 9548848c..4c6e9416 100644
--- a/docs/installation-fr.adoc
+++ b/docs/installation-fr.adoc
@@ -44,17 +44,17 @@ Il est nécessaire de gérer les fichiers de configuration, l'installation et la
 
 L'application *_Occtax-mobile_* se chargera alors de récupérer automatiquement sur le serveur GeoNature la dernière version du fichier de configuration des applications et détectera les éventuelles mises à jour disponibles pour l'application.
 
-Pour cela, chargez l'APK de l'application *_Occtax-mobile_* ainsi que son fichier de configuration `settings.json` dans le dossier `$HOME/geonature/backend/static/mobile/occtax` du serveur GeoNature.
+Pour cela, chargez l'APK de l'application *_Occtax-mobile_* ainsi que son fichier de configuration `settings.json` dans le dossier `$HOME/geonature/backend/media/mobile/occtax` du serveur GeoNature.
 
 Dans les commandes ci-dessous, remplacez `x.y.y` par le numéro (tag) de la version (release) utilisée.
 
 * *_Occtax-mobile_* : https://github.com/PnX-SI/gn_mobile_occtax/releases
 
-Sur votre serveur GeoNature, créer le sous-répertoire de l'application mobile *_Occtax-mobile_*.
+Sur votre serveur GeoNature, créez le sous-répertoire de l'application mobile *_Occtax-mobile_*.
 
 [source,shell]
 ----
-cd $HOME/geonature/backend/static/mobile
+cd ~/geonature/backend/media/mobile
 mkdir occtax
 ----
 
@@ -68,7 +68,7 @@ wget https://github.com/PnX-SI/gn_mobile_occtax/releases/download/x.y.z/occtax-y
 
 Créer le fichier de settings `settings.json` en suivant https://github.com/PnX-SI/gn_mobile_occtax#settings[la documentation] en fonction de la configuration de votre serveur GeoNature.
 
-Renseigner ensuite la table `gn_commons.t_mobile_apps` de la base de données.
+Renseigner ensuite la table `gn_commons.t_mobile_apps` directement dans la base de données ou depuis le backoffice du module "Admin" de GeoNature.
 
 Pour trouver la valeur à renseigner dans le champs `version_code`, celui-ci est mentionné dans les releases, ou reportez-vous au fichier suivant en sélectionnant le tag de version où la branche que vous utilisez :
 
@@ -80,14 +80,14 @@ Exemple de contenu de la table `gn_commons.t_mobile_apps` :
 
 [source,csv]
 ----
-1;"OCCTAX";"static/mobile/occtax/occtax-2.0.0-pne-debug.apk";"";"fr.geonature.occtax2";"2555"
+1;"OCCTAX";"occtax/occtax-2.0.0-pne-debug.apk";"";"fr.geonature.occtax2";"2555"
 ----
 
 Le résultat peut être testé en interrogeant directement la route `&lt;URL_GEONATURE&gt;/api/gn_commons/t_mobile_apps` qui est celle utilisée par l'application *_Occtax-mobile_* pour faire les mises à jour.
 
 Installez ensuite l'application *_Occtax-mobile_* sur le terminal mobile.
 
-Récupérer le fichier APK de la version souhaitée dans la fichiers de la release (assets)
+Récupérer le fichier APK de la version souhaitée dans les fichiers de la release (assets)
 
 Lancez l'application *_Occtax-mobile_* et déclarez l'URL de GeoNature et de TaxHub dans sa configuration (paramètres).
 
diff --git a/gn_mobile_core b/gn_mobile_core
index bcde27d7..2d920c99 160000
--- a/gn_mobile_core
+++ b/gn_mobile_core
@@ -1 +1 @@
-Subproject commit bcde27d7d4ccbe69470678f42c88d75f1d05df75
+Subproject commit 2d920c9902eef44089271419fa95b8b08cc40a38
diff --git a/gn_mobile_maps b/gn_mobile_maps
index b67e4b3d..50a73697 160000
--- a/gn_mobile_maps
+++ b/gn_mobile_maps
@@ -1 +1 @@
-Subproject commit b67e4b3dbac61878225aec98bda23ec7330a033f
+Subproject commit 50a736972d6012ad4eabb356b1214b2168e0ecf4
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 69d91e98..84ebdd7c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/occtax/build.gradle b/occtax/build.gradle
index cb6c7e96..e311afbf 100644
--- a/occtax/build.gradle
+++ b/occtax/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
@@ -21,9 +21,9 @@ android {
     defaultConfig {
         applicationId "fr.geonature.occtax2"
         minSdkVersion 26
-        targetSdkVersion 31
-        versionCode 3170
-        versionName "2.5.0"
+        targetSdkVersion 33
+        versionCode 3200
+        versionName "2.6.0"
         buildConfigField "String", "BUILD_DATE", "\"" + new Date().getTime() + "\""
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         archivesBaseName = project.name + "-" + versionName
@@ -76,10 +76,12 @@ dependencies {
     kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
 
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
     implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0'
+    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'androidx.work:work-runtime-ktx:2.8.1'
     implementation "io.github.l4digital:fastscroll:2.0.1"
 
     // Logging
@@ -87,12 +89,14 @@ dependencies {
     runtimeOnly "org.tinylog:tinylog-impl:$tinylog_version"
 
     // Testing dependencies
-    testImplementation 'androidx.arch.core:core-testing:2.1.0'
-    testImplementation 'androidx.test.ext:junit-ktx:1.1.3'
+    testImplementation 'androidx.arch.core:core-testing:2.2.0'
+    testImplementation 'androidx.test.ext:junit-ktx:1.1.5'
+    testImplementation 'androidx.work:work-testing:2.8.1'
     testImplementation("com.squareup.okhttp3:mockwebserver:4.10.0")
-    testImplementation 'io.mockk:mockk:1.12.3'
-    testImplementation 'io.mockk:mockk-agent-jvm:1.12.3'
+    testImplementation 'io.mockk:mockk:1.13.4'
+    testImplementation 'io.mockk:mockk-agent-jvm:1.13.4'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1'
-    testImplementation 'org.robolectric:robolectric:4.8.1'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
+    testImplementation 'org.robolectric:robolectric:4.9.2'
+    testImplementation "org.tinylog:slf4j-tinylog:$tinylog_version"
 }
diff --git a/occtax/src/main/AndroidManifest.xml b/occtax/src/main/AndroidManifest.xml
index bba5d78a..073c7c88 100644
--- a/occtax/src/main/AndroidManifest.xml
+++ b/occtax/src/main/AndroidManifest.xml
@@ -20,7 +20,8 @@
         <activity
             android:name=".ui.home.HomeActivity"
             android:exported="true"
-            android:launchMode="singleTask">
+            android:launchMode="singleTask"
+            android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -68,7 +69,6 @@
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
             tools:node="remove" />
-
         <provider
             android:name="fr.geonature.commons.data.MainContentProvider"
             android:authorities="${applicationId}.provider"
diff --git a/occtax/src/main/java/fr/geonature/occtax/MainApplication.kt b/occtax/src/main/java/fr/geonature/occtax/MainApplication.kt
index b3eb6855..4f963fb0 100644
--- a/occtax/src/main/java/fr/geonature/occtax/MainApplication.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/MainApplication.kt
@@ -61,7 +61,8 @@ class MainApplication : Application(), Configuration.Provider {
                 MountPoint.StorageType.INTERNAL,
             ),
             "logs"
-        ).also { it.mkdirs() }
+        )
+            .also { it.mkdirs() }
 
         System.setProperty(
             "tinylog.directory",
@@ -81,43 +82,35 @@ class MainApplication : Application(), Configuration.Provider {
         )
     }
 
-    private fun configureCheckInputsToSynchronizeChannel(notificationManager: NotificationManagerCompat): NotificationChannel? {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-            val channel = NotificationChannel(
-                CHANNEL_CHECK_INPUTS_TO_SYNCHRONIZE,
-                getText(R.string.channel_name_check_inputs_to_synchronize),
-                NotificationManager.IMPORTANCE_LOW
-            ).apply {
-                description = getString(R.string.channel_description_check_inputs_to_synchronize)
-                setShowBadge(true)
-            }
-
-            // register this channel with the system
-            notificationManager.createNotificationChannel(channel)
-
-            return channel
+    private fun configureCheckInputsToSynchronizeChannel(notificationManager: NotificationManagerCompat): NotificationChannel {
+        val channel = NotificationChannel(
+            CHANNEL_CHECK_INPUTS_TO_SYNCHRONIZE,
+            getText(R.string.channel_name_check_inputs_to_synchronize),
+            NotificationManager.IMPORTANCE_LOW
+        ).apply {
+            description = getString(R.string.channel_description_check_inputs_to_synchronize)
+            setShowBadge(true)
         }
 
-        return null
-    }
-
-    private fun configureSynchronizeDataChannel(notificationManager: NotificationManagerCompat): NotificationChannel? {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-            val channel = NotificationChannel(
-                CHANNEL_DATA_SYNCHRONIZATION,
-                getText(R.string.channel_name_data_synchronization),
-                NotificationManager.IMPORTANCE_LOW
-            ).apply {
-                description = getString(R.string.channel_description_data_synchronization)
-            }
+        // register this channel with the system
+        notificationManager.createNotificationChannel(channel)
 
-            // register this channel with the system
-            notificationManager.createNotificationChannel(channel)
+        return channel
+    }
 
-            return channel
+    private fun configureSynchronizeDataChannel(notificationManager: NotificationManagerCompat): NotificationChannel {
+        val channel = NotificationChannel(
+            CHANNEL_DATA_SYNCHRONIZATION,
+            getText(R.string.channel_name_data_synchronization),
+            NotificationManager.IMPORTANCE_LOW
+        ).apply {
+            description = getString(R.string.channel_description_data_synchronization)
         }
 
-        return null
+        // register this channel with the system
+        notificationManager.createNotificationChannel(channel)
+
+        return channel
     }
 
     private class TinylogUncaughtExceptionHandler : Thread.UncaughtExceptionHandler {
diff --git a/occtax/src/main/java/fr/geonature/occtax/features/nomenclature/presentation/EditableNomenclatureTypeAdapter.kt b/occtax/src/main/java/fr/geonature/occtax/features/nomenclature/presentation/EditableNomenclatureTypeAdapter.kt
index 4ddbdfe9..1f19fb4a 100644
--- a/occtax/src/main/java/fr/geonature/occtax/features/nomenclature/presentation/EditableNomenclatureTypeAdapter.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/features/nomenclature/presentation/EditableNomenclatureTypeAdapter.kt
@@ -1,5 +1,6 @@
 package fr.geonature.occtax.features.nomenclature.presentation
 
+import android.annotation.SuppressLint
 import android.text.Editable
 import android.text.InputType
 import android.text.TextWatcher
@@ -272,6 +273,7 @@ class EditableNomenclatureTypeAdapter(private val listener: OnEditableNomenclatu
         /**
          * Build the default label for given editable nomenclature type as fallback.
          */
+        @SuppressLint("DiscouragedApi")
         fun getNomenclatureTypeLabel(mnemonic: String): String {
             return itemView.resources.getIdentifier(
                 "nomenclature_${mnemonic.lowercase()}",
diff --git a/occtax/src/main/java/fr/geonature/occtax/features/record/ObservationRecordModule.kt b/occtax/src/main/java/fr/geonature/occtax/features/record/ObservationRecordModule.kt
index e4824ebc..423f19c8 100644
--- a/occtax/src/main/java/fr/geonature/occtax/features/record/ObservationRecordModule.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/features/record/ObservationRecordModule.kt
@@ -12,7 +12,6 @@ import fr.geonature.commons.features.taxon.data.ITaxonLocalDataSource
 import fr.geonature.commons.settings.IAppSettingsManager
 import fr.geonature.datasync.api.IGeoNatureAPIClient
 import fr.geonature.datasync.auth.IAuthManager
-import fr.geonature.datasync.packageinfo.ISynchronizeObservationRecordRepository
 import fr.geonature.occtax.api.IOcctaxAPIClient
 import fr.geonature.occtax.features.record.data.IMediaRecordLocalDataSource
 import fr.geonature.occtax.features.record.data.IObservationRecordLocalDataSource
@@ -22,6 +21,7 @@ import fr.geonature.occtax.features.record.data.ObservationRecordLocalDataSource
 import fr.geonature.occtax.features.record.data.ObservationRecordRemoteDataSourceImpl
 import fr.geonature.occtax.features.record.repository.IMediaRecordRepository
 import fr.geonature.occtax.features.record.repository.IObservationRecordRepository
+import fr.geonature.occtax.features.record.repository.ISynchronizeObservationRecordRepository
 import fr.geonature.occtax.features.record.repository.MediaRecordRepositoryImpl
 import fr.geonature.occtax.features.record.repository.ObservationRecordRepositoryImpl
 import fr.geonature.occtax.features.record.repository.SynchronizeObservationRecordRepositoryImpl
diff --git a/occtax/src/main/java/fr/geonature/occtax/features/record/data/ObservationRecordLocalDataSourceImpl.kt b/occtax/src/main/java/fr/geonature/occtax/features/record/data/ObservationRecordLocalDataSourceImpl.kt
index 437c4432..38dcc998 100644
--- a/occtax/src/main/java/fr/geonature/occtax/features/record/data/ObservationRecordLocalDataSourceImpl.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/features/record/data/ObservationRecordLocalDataSourceImpl.kt
@@ -40,7 +40,7 @@ class ObservationRecordLocalDataSourceImpl(
         ObservationRecordJsonWriter()
 
     override suspend fun readAll(): List<ObservationRecord> {
-        val exportedInput = FileUtils
+        val exportedObservationRecords = FileUtils
             .getInputsFolder(context)
             .walkTopDown()
             .asFlow()
@@ -66,16 +66,17 @@ class ObservationRecordLocalDataSourceImpl(
 
         return withContext(dispatcher) {
             (
-                exportedInput + preferenceManager.all
+                preferenceManager.all
                     .filterKeys { it.startsWith("${KEY_PREFERENCE_INPUT}_") }
                     .values
-                    .mapNotNull { if (it is String && it.isNotBlank()) runCatching { observationRecordJsonReader.read(it) }.getOrNull() else null }
-                ).sortedBy { it.internalId }
+                    .mapNotNull { if (it is String && it.isNotBlank()) runCatching { observationRecordJsonReader.read(it) }.getOrNull() else null } + exportedObservationRecords
+                ).distinctBy { it.internalId }
+                .sortedByDescending { it.dates.start }
         }
     }
 
     override suspend fun read(id: Long): ObservationRecord = withContext(dispatcher) {
-        val inputAsJson = preferenceManager.getString(
+        val observationRecordAsJson = preferenceManager.getString(
             buildInputPreferenceKey(id),
             null
         )
@@ -88,11 +89,11 @@ class ObservationRecordLocalDataSourceImpl(
                 .takeIf { it.exists() }
                 ?.readText()
 
-        if (inputAsJson.isNullOrBlank()) {
+        if (observationRecordAsJson.isNullOrBlank()) {
             throw ObservationRecordException.NotFoundException(id)
         }
 
-        runCatching { observationRecordJsonReader.read(inputAsJson) }
+        runCatching { observationRecordJsonReader.read(observationRecordAsJson) }
             .onFailure { throw ObservationRecordException.ReadException(id) }
             .getOrThrow()
     }
@@ -162,10 +163,10 @@ class ObservationRecordLocalDataSourceImpl(
     }
 
     override suspend fun export(id: Long, settings: AppSettings?): ObservationRecord {
-        val inputToExport = read(id)
+        val observationRecordToExport = read(id)
 
         return export(
-            inputToExport,
+            observationRecordToExport,
             settings
         )
     }
diff --git a/occtax/src/main/java/fr/geonature/occtax/features/record/domain/ObservationRecord.kt b/occtax/src/main/java/fr/geonature/occtax/features/record/domain/ObservationRecord.kt
index 125eb814..72825be2 100644
--- a/occtax/src/main/java/fr/geonature/occtax/features/record/domain/ObservationRecord.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/features/record/domain/ObservationRecord.kt
@@ -83,7 +83,10 @@ data class ObservationRecord(
 
     enum class Status {
         DRAFT,
-        TO_SYNC
+        TO_SYNC,
+        SYNC_IN_PROGRESS,
+        SYNC_ERROR,
+        SYNC_SUCCESSFUL
     }
 }
 
diff --git a/occtax/src/main/java/fr/geonature/occtax/features/record/domain/SynchronizationStatus.kt b/occtax/src/main/java/fr/geonature/occtax/features/record/domain/SynchronizationStatus.kt
new file mode 100644
index 00000000..4e58e7a9
--- /dev/null
+++ b/occtax/src/main/java/fr/geonature/occtax/features/record/domain/SynchronizationStatus.kt
@@ -0,0 +1,25 @@
+package fr.geonature.occtax.features.record.domain
+
+import androidx.work.WorkInfo
+
+/**
+ * Describes the current status of [ObservationRecord] synchronization.
+ *
+ * @author S. Grimault
+ */
+sealed class SynchronizationStatus(open val state: WorkInfo.State ) {
+
+    /**
+     * The current worker status.
+     */
+    data class WorkerStatus(override val state: WorkInfo.State) : SynchronizationStatus(state)
+
+    /**
+     * The current [ObservationRecord] status.
+     */
+    data class ObservationRecordStatus(
+        override val state: WorkInfo.State,
+        val internalId: Long,
+        val status: ObservationRecord.Status
+    ) : SynchronizationStatus(state)
+}
diff --git a/occtax/src/main/java/fr/geonature/occtax/features/record/presentation/ObservationRecordViewModel.kt b/occtax/src/main/java/fr/geonature/occtax/features/record/presentation/ObservationRecordViewModel.kt
index f1cd31ff..9dd39187 100644
--- a/occtax/src/main/java/fr/geonature/occtax/features/record/presentation/ObservationRecordViewModel.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/features/record/presentation/ObservationRecordViewModel.kt
@@ -1,19 +1,30 @@
 package fr.geonature.occtax.features.record.presentation
 
+import android.app.Application
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.liveData
+import androidx.lifecycle.map
+import androidx.lifecycle.switchMap
 import androidx.lifecycle.viewModelScope
+import androidx.work.WorkInfo
+import androidx.work.WorkManager
 import dagger.hilt.android.lifecycle.HiltViewModel
 import fr.geonature.commons.interactor.BaseResultUseCase
-import fr.geonature.commons.lifecycle.BaseViewModel
+import fr.geonature.commons.lifecycle.BaseAndroidViewModel
 import fr.geonature.occtax.features.record.domain.ObservationRecord
+import fr.geonature.occtax.features.record.domain.SynchronizationStatus
 import fr.geonature.occtax.features.record.usecase.DeleteObservationRecordUseCase
 import fr.geonature.occtax.features.record.usecase.EditObservationRecordUseCase
 import fr.geonature.occtax.features.record.usecase.ExportObservationRecordUseCase
 import fr.geonature.occtax.features.record.usecase.GetAllObservationRecordsUseCase
 import fr.geonature.occtax.features.record.usecase.SaveObservationRecordUseCase
+import fr.geonature.occtax.features.record.worker.SynchronizeObservationRecordsWorker
 import fr.geonature.occtax.settings.AppSettings
+import kotlinx.coroutines.delay
 import org.tinylog.kotlin.Logger
+import java.util.UUID
 import javax.inject.Inject
 
 /**
@@ -23,19 +34,123 @@ import javax.inject.Inject
  */
 @HiltViewModel
 class ObservationRecordViewModel @Inject constructor(
+    application: Application,
     private val getAllObservationRecordsUseCase: GetAllObservationRecordsUseCase,
     private val saveObservationRecordUseCase: SaveObservationRecordUseCase,
     private val editObservationRecordUseCase: EditObservationRecordUseCase,
     private val deleteObservationRecordUseCase: DeleteObservationRecordUseCase,
     private val exportObservationRecordUseCase: ExportObservationRecordUseCase
-) : BaseViewModel() {
+) : BaseAndroidViewModel(application) {
 
-    private val _observationRecords = MutableLiveData<List<ObservationRecord>>()
-    val observationRecords: LiveData<List<ObservationRecord>> = _observationRecords
+    private val workManager: WorkManager = WorkManager.getInstance(getApplication())
 
+    private val _observationRecords = MutableLiveData<List<ObservationRecord>>()
     private val _observationRecord = MutableLiveData<ObservationRecord>()
+
+    /**
+     * The current [ObservationRecord] being edited.
+     */
     val observationRecord: LiveData<ObservationRecord> = _observationRecord
 
+    private var currentSyncWorkerId: UUID? = null
+        set(value) {
+            field = value
+            _isSyncRunning.postValue(field != null)
+        }
+
+    private val _isSyncRunning: MutableLiveData<Boolean> = MutableLiveData(false)
+    val isSyncRunning: LiveData<Boolean> = _isSyncRunning
+
+    private val _observeSynchronizationStatus: LiveData<SynchronizationStatus?> =
+        workManager.getWorkInfosByTagLiveData(
+            SynchronizeObservationRecordsWorker.OBSERVATION_RECORDS_SYNC_WORKER_TAG
+        )
+            .map { workInfoList ->
+                if (workInfoList == null || workInfoList.isEmpty()) {
+                    currentSyncWorkerId = null
+                    return@map null
+                }
+
+                val workInfo = workInfoList.firstOrNull { it.id == currentSyncWorkerId }
+                    ?: workInfoList.firstOrNull { it.state == WorkInfo.State.RUNNING }
+
+                // no work info is running: abort
+                if (workInfo == null) {
+                    currentSyncWorkerId = null
+                    return@map null
+                }
+
+                // this is a new work info: set the current worker
+                if (workInfo.id != currentSyncWorkerId) {
+                    currentSyncWorkerId = workInfo.id
+                }
+
+                workInfoList.firstOrNull()
+                    ?.let {
+                        SynchronizeObservationRecordsWorker.toSynchronizationStatus(it)
+                    }
+                    ?.also {
+                        if (it.state.isFinished) currentSyncWorkerId = null
+                    }
+                    ?: return@map null
+            }
+
+    /**
+     * All [ObservationRecord]s loaded.
+     */
+    val observationRecords: LiveData<List<ObservationRecord>> =
+        MediatorLiveData<List<ObservationRecord>>().apply {
+            addSource(_observationRecords) {
+                value = it.map { observationRecord ->
+                    if (observationRecord.status == ObservationRecord.Status.DRAFT) return@map observationRecord
+
+                    (value
+                        ?: emptyList()).firstOrNull { existingObservationRecord ->
+                        existingObservationRecord.internalId == observationRecord.internalId
+                    }
+                        ?.let { existingObservationRecord ->
+                            observationRecord.copy(status = existingObservationRecord.status.takeIf { status ->
+                                status.ordinal > observationRecord.status.ordinal
+                            }
+                                ?: observationRecord.status)
+                        }
+                        ?: observationRecord
+                }
+            }
+            addSource(_observeSynchronizationStatus.switchMap { synchronizationStatus ->
+                liveData {
+                    if (synchronizationStatus == null) return@liveData
+                    if (synchronizationStatus !is SynchronizationStatus.ObservationRecordStatus) return@liveData
+
+                    emit(synchronizationStatus)
+
+                    if (synchronizationStatus.status == ObservationRecord.Status.SYNC_SUCCESSFUL) {
+                        delay(500)
+                        value =
+                            (value ?: emptyList()).filter {
+                                it.internalId != synchronizationStatus.internalId
+                            }
+                    }
+                }
+            }) { synchronizationStatus ->
+                value = (value ?: emptyList()).map { observationRecord ->
+                    if (synchronizationStatus.internalId == observationRecord.internalId) {
+                        observationRecord.copy(status = synchronizationStatus.status)
+                    } else observationRecord
+                }
+            }
+        }
+
+    /**
+     * Whether some [ObservationRecord]s are ready to synchronize according to their current status.
+     */
+    val hasObservationRecordsReadyToSynchronize =
+        observationRecords.map { observationRecords ->
+            observationRecords.any {
+                it.status == ObservationRecord.Status.TO_SYNC
+            }
+        }
+
     /**
      * Gets all [ObservationRecord]s.
      *
@@ -159,4 +274,13 @@ class ObservationRecordViewModel @Inject constructor(
             )
         }
     }
+
+    /**
+     * Synchronizes all eligible [ObservationRecord]s (i.e. with a valid status [ObservationRecord.Status.TO_SYNC]).
+     */
+    fun synchronizeObservationRecords() {
+        currentSyncWorkerId = SynchronizeObservationRecordsWorker.enqueueUniqueWork(
+            getApplication()
+        )
+    }
 }
\ No newline at end of file
diff --git a/occtax/src/main/java/fr/geonature/occtax/features/record/repository/ISynchronizeObservationRecordRepository.kt b/occtax/src/main/java/fr/geonature/occtax/features/record/repository/ISynchronizeObservationRecordRepository.kt
new file mode 100644
index 00000000..c7da8041
--- /dev/null
+++ b/occtax/src/main/java/fr/geonature/occtax/features/record/repository/ISynchronizeObservationRecordRepository.kt
@@ -0,0 +1,19 @@
+package fr.geonature.occtax.features.record.repository
+
+import fr.geonature.occtax.features.record.domain.ObservationRecord
+import fr.geonature.occtax.features.record.error.ObservationRecordException
+
+/**
+ * Synchronize observation record.
+ *
+ * @author S. Grimault
+ */
+interface ISynchronizeObservationRecordRepository {
+
+    /**
+     * Performs synchronization of given [ObservationRecord].
+     * Returns [ObservationRecordException.InvalidStatusException] if this [ObservationRecord] has a
+     * wrong status.
+     */
+    suspend fun synchronize(observationRecord: ObservationRecord): Result<ObservationRecord>
+}
\ No newline at end of file
diff --git a/occtax/src/main/java/fr/geonature/occtax/features/record/repository/SynchronizeObservationRecordRepositoryImpl.kt b/occtax/src/main/java/fr/geonature/occtax/features/record/repository/SynchronizeObservationRecordRepositoryImpl.kt
index e6b94bc9..329bafd3 100644
--- a/occtax/src/main/java/fr/geonature/occtax/features/record/repository/SynchronizeObservationRecordRepositoryImpl.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/features/record/repository/SynchronizeObservationRecordRepositoryImpl.kt
@@ -9,7 +9,6 @@ import fr.geonature.datasync.api.IGeoNatureAPIClient
 import fr.geonature.datasync.api.model.AuthUser
 import fr.geonature.datasync.auth.IAuthManager
 import fr.geonature.datasync.auth.error.AuthException
-import fr.geonature.datasync.packageinfo.ISynchronizeObservationRecordRepository
 import fr.geonature.datasync.settings.error.DataSyncSettingsNotFoundException
 import fr.geonature.occtax.R
 import fr.geonature.occtax.features.record.data.IMediaRecordLocalDataSource
@@ -42,8 +41,10 @@ class SynchronizeObservationRecordRepositoryImpl(
     private val mediaRecordLocalDataSource: IMediaRecordLocalDataSource
 ) : ISynchronizeObservationRecordRepository {
 
-    override suspend fun invoke(recordId: Long): Result<Unit> {
-        Logger.info { "synchronize observation record '$recordId'..." }
+    override suspend fun synchronize(observationRecord: ObservationRecord): Result<ObservationRecord> {
+        Logger.info {
+            "synchronize observation record '${observationRecord.internalId}'..."
+        }
 
         val authUser = authManager.getAuthLogin()?.user
             ?: return Result.failure(AuthException.NotConnectedException)
@@ -56,13 +57,10 @@ class SynchronizeObservationRecordRepositoryImpl(
 
         observationRecordRemoteDataSource.setBaseUrl(dataSyncSettings.geoNatureServerUrl)
 
-        val observationRecord =
-            runCatching { observationRecordLocalDataSource.read(recordId) }.getOrElse {
-                return Result.failure(it)
-            }
-
         if (observationRecord.status != ObservationRecord.Status.TO_SYNC) {
-            return Result.failure(ObservationRecordException.InvalidStatusException(observationRecord.internalId))
+            return Result.failure(
+                ObservationRecordException.InvalidStatusException(observationRecord.internalId)
+            )
         }
 
         val nomenclatureForImage = getNomenclatureForImage()
@@ -72,7 +70,9 @@ class SynchronizeObservationRecordRepositoryImpl(
                 geoNatureAPIClient.getIdTableLocation()
                     .await()
             }.onFailure {
-                Logger.warn { "failed to fetch ID table location" }
+                Logger.warn {
+                    "failed to fetch ID table location"
+                }
             }
                 .getOrNull()
 
@@ -81,13 +81,21 @@ class SynchronizeObservationRecordRepositoryImpl(
                 observationRecord,
                 appSettings
             )
-        }.onFailure { Logger.error { "failed to synchronize observation record '$recordId'" } }
+        }.onFailure {
+            Logger.error {
+                "failed to synchronize observation record '${observationRecord.internalId}'"
+            }
+        }
             .getOrElse {
                 return Result.failure(it)
             }
 
-        Logger.info { "observation record created from GeoNature: '${observationRecordSent.id}'" }
-        Logger.info { "synchronize ${observationRecordSent.taxa.taxa.size} taxa from observation record '$recordId'..." }
+        Logger.info {
+            "observation record created from GeoNature: '${observationRecordSent.id}'"
+        }
+        Logger.info {
+            "synchronize ${observationRecordSent.taxa.taxa.size} taxa from observation record '${observationRecord.internalId}'..."
+        }
 
         if (nomenclatureForImage != null && idTableLocation != null) {
             observationRecord.taxa.taxa.forEach {
@@ -106,28 +114,38 @@ class SynchronizeObservationRecordRepositoryImpl(
                 appSettings
             )
         }.onFailure {
-            Logger.error { "failed to synchronize all taxa from observation record '$recordId'" }
-            Logger.info { "deleting observation record '${observationRecordSent.id}' from GeoNature..." }
+            Logger.error {
+                "failed to synchronize all taxa from observation record '${observationRecord.internalId}'"
+            }
+            Logger.info {
+                "deleting observation record '${observationRecordSent.id}' from GeoNature..."
+            }
 
             deleteAllSynchronizedMediaFiles(observationRecordSent)
 
             runCatching {
                 observationRecordRemoteDataSource.deleteObservationRecord(observationRecordSent)
             }.onFailure {
-                Logger.warn { "failed to delete observation record '${observationRecordSent.id}' from GeoNature" }
+                Logger.warn {
+                    "failed to delete observation record '${observationRecordSent.id}' from GeoNature"
+                }
             }
         }
             .getOrElse {
                 return Result.failure(it)
             }
 
-        Logger.info { "observation record '$recordId' successfully synchronized" }
+        Logger.info {
+            "observation record '${observationRecord.internalId}' successfully synchronized"
+        }
 
-        runCatching { observationRecordLocalDataSource.delete(recordId) }.onFailure {
-            Logger.warn { "failed to delete a fully synchronized observation record '$recordId'" }
+        runCatching { observationRecordLocalDataSource.delete(observationRecord.internalId) }.onFailure {
+            Logger.warn {
+                "failed to delete a fully synchronized observation record '${observationRecord.internalId}'"
+            }
         }
 
-        return Result.success(Unit)
+        return Result.success(observationRecordSent)
     }
 
     private suspend fun getNomenclatureForImage(): Nomenclature? {
@@ -136,7 +154,10 @@ class SynchronizeObservationRecordRepositoryImpl(
         }.getOrNull()
 
         if (nomenclatures == null) {
-            Logger.warn { "'TYPE_MEDIA' nomenclature type not found" }
+            Logger.warn {
+                "'TYPE_MEDIA' nomenclature type not found"
+            }
+
             return null
         }
 
@@ -146,7 +167,10 @@ class SynchronizeObservationRecordRepositoryImpl(
         }
 
         if (nomenclatureForImage == null) {
-            Logger.warn { "no nomenclature found matching media type 'image/*'" }
+            Logger.warn {
+                "no nomenclature found matching media type 'image/*'"
+            }
+
             return null
         }
 
@@ -196,10 +220,14 @@ class SynchronizeObservationRecordRepositoryImpl(
                         )
                             .await()
                     }.onSuccess {
-                        Logger.info { "media file '${file.absolutePath}' successfully synchronized" }
+                        Logger.info {
+                            "media file '${file.absolutePath}' successfully synchronized"
+                        }
                     }
                         .onFailure {
-                            Logger.warn(it) { "failed to send media file '${file.absolutePath}'..." }
+                            Logger.warn(it) {
+                                "failed to send media file '${file.absolutePath}'..."
+                            }
                         }
                         .getOrNull()
                 }
@@ -207,7 +235,9 @@ class SynchronizeObservationRecordRepositoryImpl(
     }
 
     private suspend fun deleteAllSynchronizedMediaFiles(observationRecord: ObservationRecord) {
-        Logger.info { "deleting already uploaded media files…" }
+        Logger.info {
+            "deleting already uploaded media files..."
+        }
 
         observationRecord.taxa.taxa.forEach { taxonRecord ->
             taxonRecord.counting.counting.forEach { countingRecord ->
@@ -216,7 +246,9 @@ class SynchronizeObservationRecordRepositoryImpl(
                         geoNatureAPIClient.deleteMediaFile(media.id)
                             .awaitResponse()
                     }.onFailure {
-                        Logger.warn(it) { "failed to delete media file ${media.id}..." }
+                        Logger.warn(it) {
+                            "failed to delete media file ${media.id}..."
+                        }
                     }
                 }
             }
diff --git a/occtax/src/main/java/fr/geonature/occtax/features/record/worker/SynchronizeObservationRecordsWorker.kt b/occtax/src/main/java/fr/geonature/occtax/features/record/worker/SynchronizeObservationRecordsWorker.kt
new file mode 100644
index 00000000..51cf2d1f
--- /dev/null
+++ b/occtax/src/main/java/fr/geonature/occtax/features/record/worker/SynchronizeObservationRecordsWorker.kt
@@ -0,0 +1,204 @@
+package fr.geonature.occtax.features.record.worker
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.Constraints
+import androidx.work.CoroutineWorker
+import androidx.work.Data
+import androidx.work.ExistingWorkPolicy
+import androidx.work.NetworkType
+import androidx.work.OneTimeWorkRequest
+import androidx.work.WorkInfo
+import androidx.work.WorkManager
+import androidx.work.WorkerParameters
+import androidx.work.await
+import androidx.work.workDataOf
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import fr.geonature.occtax.features.record.domain.ObservationRecord
+import fr.geonature.occtax.features.record.domain.SynchronizationStatus
+import fr.geonature.occtax.features.record.repository.IObservationRecordRepository
+import fr.geonature.occtax.features.record.repository.ISynchronizeObservationRecordRepository
+import kotlinx.coroutines.delay
+import org.tinylog.Logger
+import java.util.Date
+import java.util.UUID
+
+/**
+ * Dedicated worker to synchronize all [ObservationRecord]s with valid status.
+ *
+ * @author S. Grimault
+ */
+@HiltWorker
+class SynchronizeObservationRecordsWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted workerParams: WorkerParameters,
+    private val observationRecordRepository: IObservationRecordRepository,
+    private val synchronizeObservationRecordRepository: ISynchronizeObservationRecordRepository
+) : CoroutineWorker(
+    appContext,
+    workerParams
+) {
+    private val workManager = WorkManager.getInstance(applicationContext)
+
+    override suspend fun doWork(): Result {
+        val startTime = Date()
+
+        val alreadyRunning = workManager
+            .getWorkInfosByTag(OBSERVATION_RECORDS_SYNC_WORKER_TAG)
+            .await()
+            .any { it.id != id && it.state == WorkInfo.State.RUNNING }
+
+        if (alreadyRunning) {
+            Logger.warn { "already running: abort" }
+
+            return Result.retry()
+        }
+
+        val observationRecordsToSynchronize = observationRecordRepository.readAll()
+            .getOrDefault(emptyList())
+            .filter { it.status == ObservationRecord.Status.TO_SYNC }
+
+        if (observationRecordsToSynchronize.isEmpty()) {
+            Logger.info { "no observation records to synchronize" }
+
+            return Result.success(workData(state = WorkInfo.State.SUCCEEDED))
+        }
+
+        val observationRecordsSynchronized = mutableListOf<ObservationRecord>()
+
+        observationRecordsToSynchronize.forEach { observationRecordToSync ->
+            setProgress(
+                workData(
+                    WorkInfo.State.RUNNING,
+                    observationRecordToSync.internalId,
+                    ObservationRecord.Status.SYNC_IN_PROGRESS
+                )
+            )
+
+            delay(500)
+
+            synchronizeObservationRecordRepository.synchronize(observationRecordToSync)
+                .fold(
+                    onSuccess = {
+                        setProgress(
+                            workData(
+                                state = WorkInfo.State.RUNNING,
+                                recordInternalId = observationRecordToSync.internalId,
+                                recordStatus = ObservationRecord.Status.SYNC_SUCCESSFUL
+                            )
+                        )
+                        observationRecordsSynchronized.add(it)
+                    },
+                    onFailure = {
+                        setProgress(
+                            workData(
+                                state = WorkInfo.State.RUNNING,
+                                recordInternalId = observationRecordToSync.internalId,
+                                recordStatus = ObservationRecord.Status.SYNC_ERROR
+                            )
+                        )
+                    }
+                )
+
+            delay(500)
+        }
+
+        Logger.info {
+            "observation records synchronization ${if (observationRecordsSynchronized.size == observationRecordsToSynchronize.size) "successfully finished" else "finished with errors"} in ${Date().time - startTime.time}ms"
+        }
+
+        return if (observationRecordsSynchronized.size == observationRecordsToSynchronize.size) {
+            Result.success(
+                workData(state = WorkInfo.State.SUCCEEDED)
+            )
+        } else {
+            Result.failure(
+                workData(state = WorkInfo.State.FAILED)
+            )
+        }
+    }
+
+    private fun workData(
+        state: WorkInfo.State,
+        recordInternalId: Long? = null,
+        recordStatus: ObservationRecord.Status? = null
+    ): Data {
+        return workDataOf(
+            KEY_WORKER_STATUS to state.ordinal,
+            KEY_OBSERVATION_RECORD_INTERNAL_ID to recordInternalId,
+            KEY_OBSERVATION_RECORD_STATUS to recordStatus?.ordinal
+        )
+    }
+
+    companion object {
+
+        private const val KEY_WORKER_STATUS = "key_worker_status"
+        private const val KEY_OBSERVATION_RECORD_INTERNAL_ID = "key_observation_record_internal_id"
+        private const val KEY_OBSERVATION_RECORD_STATUS = "key_observation_record_status"
+
+        private const val OBSERVATION_RECORDS_SYNC_WORKER = "observation_records_sync_worker"
+        const val OBSERVATION_RECORDS_SYNC_WORKER_TAG = "observation_records_sync_worker_tag"
+
+        /**
+         * Convenience method for enqueuing unique work to this worker.
+         */
+        fun enqueueUniqueWork(context: Context): UUID {
+            val workRequest = OneTimeWorkRequest
+                .Builder(SynchronizeObservationRecordsWorker::class.java)
+                .addTag(OBSERVATION_RECORDS_SYNC_WORKER_TAG)
+                .setConstraints(
+                    Constraints
+                        .Builder()
+                        .setRequiredNetworkType(NetworkType.CONNECTED)
+                        .build()
+                )
+                .build()
+
+            return workRequest.id.also {
+                WorkManager.getInstance(context)
+                    .enqueueUniqueWork(
+                        OBSERVATION_RECORDS_SYNC_WORKER,
+                        ExistingWorkPolicy.KEEP,
+                        workRequest
+                    )
+            }
+        }
+
+        fun toSynchronizationStatus(workInfo: WorkInfo): SynchronizationStatus? {
+            val validWorkInfo = workInfo.progress.getInt(
+                KEY_WORKER_STATUS,
+                -1
+            )
+                .takeIf { it >= 0 }
+                ?.let { workInfo.progress } ?: workInfo.outputData.getInt(
+                KEY_WORKER_STATUS,
+                -1
+            )
+                .takeIf { it >= 0 }
+                ?.let { workInfo.outputData } ?: return null
+
+            val workerStatus = WorkInfo.State.values()[validWorkInfo.getInt(
+                KEY_WORKER_STATUS,
+                0
+            )]
+            val observationRecordInternalId = validWorkInfo.getLong(
+                KEY_OBSERVATION_RECORD_INTERNAL_ID,
+                0
+            )
+                .takeIf { it > 0 }
+            val observationRecordStatus = validWorkInfo.getInt(
+                KEY_OBSERVATION_RECORD_STATUS,
+                -1
+            )
+                .takeIf { it >= 0 }
+                ?.let { ObservationRecord.Status.values()[it] }
+
+            return if (observationRecordInternalId != null && observationRecordStatus != null) SynchronizationStatus.ObservationRecordStatus(
+                state = workerStatus,
+                internalId = observationRecordInternalId,
+                status = observationRecordStatus
+            ) else SynchronizationStatus.WorkerStatus(state = workerStatus)
+        }
+    }
+}
\ No newline at end of file
diff --git a/occtax/src/main/java/fr/geonature/occtax/settings/AppSettings.kt b/occtax/src/main/java/fr/geonature/occtax/settings/AppSettings.kt
index f7d4c42e..bc9a1371 100644
--- a/occtax/src/main/java/fr/geonature/occtax/settings/AppSettings.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/settings/AppSettings.kt
@@ -1,16 +1,16 @@
 package fr.geonature.occtax.settings
 
-import android.os.Parcel
-import android.os.Parcelable
 import fr.geonature.commons.settings.IAppSettings
 import fr.geonature.datasync.settings.DataSyncSettings
 import fr.geonature.maps.settings.MapSettings
+import kotlinx.parcelize.Parcelize
 
 /**
  * Global internal settings.
  *
  * @author S. Grimault
  */
+@Parcelize
 data class AppSettings(
     var areaObservationDuration: Int = DEFAULT_AREA_OBSERVATION_DURATION,
     var inputSettings: InputSettings = InputSettings(dateSettings = InputDateSettings.DEFAULT),
@@ -19,44 +19,6 @@ data class AppSettings(
     var nomenclatureSettings: NomenclatureSettings? = null
 ) : IAppSettings {
 
-    private constructor(source: Parcel) : this(
-        source.readInt(),
-        source.readParcelable(InputSettings::class.java.classLoader)
-            ?: InputSettings(dateSettings = InputDateSettings.DEFAULT),
-        source.readParcelable(DataSyncSettings::class.java.classLoader) as DataSyncSettings?,
-        source.readParcelable(MapSettings::class.java.classLoader) as MapSettings?,
-        source.readParcelable(NomenclatureSettings::class.java.classLoader) as NomenclatureSettings?
-    )
-
-    override fun describeContents(): Int {
-        return 0
-    }
-
-    override fun writeToParcel(
-        dest: Parcel?,
-        flags: Int
-    ) {
-        dest?.also {
-            it.writeInt(areaObservationDuration)
-            it.writeParcelable(
-                inputSettings,
-                0
-            )
-            it.writeParcelable(
-                dataSyncSettings,
-                0
-            )
-            it.writeParcelable(
-                mapSettings,
-                0
-            )
-            it.writeParcelable(
-                nomenclatureSettings,
-                0
-            )
-        }
-    }
-
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (other !is AppSettings) return false
@@ -82,16 +44,5 @@ data class AppSettings(
 
     companion object {
         const val DEFAULT_AREA_OBSERVATION_DURATION = 365
-
-        @JvmField
-        val CREATOR: Parcelable.Creator<AppSettings> = object : Parcelable.Creator<AppSettings> {
-            override fun createFromParcel(parcel: Parcel): AppSettings {
-                return AppSettings(parcel)
-            }
-
-            override fun newArray(size: Int): Array<AppSettings?> {
-                return arrayOfNulls(size)
-            }
-        }
     }
 }
diff --git a/occtax/src/main/java/fr/geonature/occtax/settings/InputDateSettings.kt b/occtax/src/main/java/fr/geonature/occtax/settings/InputDateSettings.kt
index 4eaa33dd..8599813b 100644
--- a/occtax/src/main/java/fr/geonature/occtax/settings/InputDateSettings.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/settings/InputDateSettings.kt
@@ -1,56 +1,22 @@
 package fr.geonature.occtax.settings
 
-import android.os.Parcel
 import android.os.Parcelable
 import fr.geonature.occtax.features.record.domain.ObservationRecord
+import kotlinx.parcelize.Parcelize
 
 /**
  * [ObservationRecord] date settings.
  *
  * @author S. Grimault
  */
+@Parcelize
 data class InputDateSettings(
     val startDateSettings: DateSettings? = null,
     val endDateSettings: DateSettings? = null
 ) : Parcelable {
-    private constructor(parcel: Parcel) : this(
-        parcel.readString().let { dateSettingsAsString ->
-            DateSettings
-                .values()
-                .firstOrNull { it.name == dateSettingsAsString }
-        },
-        parcel.readString().let { dateSettingsAsString ->
-            DateSettings
-                .values()
-                .firstOrNull { it.name == dateSettingsAsString }
-        }
-    )
-
-    override fun describeContents(): Int {
-        return 0
-    }
-
-    override fun writeToParcel(dest: Parcel?, flags: Int) {
-        dest?.also {
-            it.writeString(startDateSettings?.name)
-            it.writeString(endDateSettings?.name)
-        }
-    }
 
     companion object {
         val DEFAULT = InputDateSettings(startDateSettings = DateSettings.DATE)
-        
-        @JvmField
-        val CREATOR: Parcelable.Creator<InputDateSettings> =
-            object : Parcelable.Creator<InputDateSettings> {
-                override fun createFromParcel(parcel: Parcel): InputDateSettings {
-                    return InputDateSettings(parcel)
-                }
-
-                override fun newArray(size: Int): Array<InputDateSettings?> {
-                    return arrayOfNulls(size)
-                }
-            }
     }
 
     enum class DateSettings {
diff --git a/occtax/src/main/java/fr/geonature/occtax/settings/InputSettings.kt b/occtax/src/main/java/fr/geonature/occtax/settings/InputSettings.kt
index 487842be..de790065 100644
--- a/occtax/src/main/java/fr/geonature/occtax/settings/InputSettings.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/settings/InputSettings.kt
@@ -1,43 +1,13 @@
 package fr.geonature.occtax.settings
 
-import android.os.Parcel
 import android.os.Parcelable
 import fr.geonature.occtax.features.record.domain.ObservationRecord
+import kotlinx.parcelize.Parcelize
 
 /**
  * [ObservationRecord] settings.
  *
  * @author S. Grimault
  */
-data class InputSettings(val dateSettings: InputDateSettings) : Parcelable {
-    private constructor(source: Parcel) : this(
-        source.readParcelable(InputDateSettings::class.java.classLoader) as InputDateSettings?
-            ?: InputDateSettings.DEFAULT
-    )
-
-    override fun describeContents(): Int {
-        return 0
-    }
-
-    override fun writeToParcel(
-        dest: Parcel?,
-        flags: Int
-    ) {
-        dest?.also {
-            it.writeParcelable(
-                dateSettings,
-                0
-            )
-        }
-    }
-
-    companion object CREATOR : Parcelable.Creator<InputSettings> {
-        override fun createFromParcel(parcel: Parcel): InputSettings {
-            return InputSettings(parcel)
-        }
-
-        override fun newArray(size: Int): Array<InputSettings?> {
-            return arrayOfNulls(size)
-        }
-    }
-}
+@Parcelize
+data class InputSettings(val dateSettings: InputDateSettings) : Parcelable
\ No newline at end of file
diff --git a/occtax/src/main/java/fr/geonature/occtax/settings/NomenclatureSettings.kt b/occtax/src/main/java/fr/geonature/occtax/settings/NomenclatureSettings.kt
index 8bae16f2..b0ef06a0 100644
--- a/occtax/src/main/java/fr/geonature/occtax/settings/NomenclatureSettings.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/settings/NomenclatureSettings.kt
@@ -1,60 +1,16 @@
 package fr.geonature.occtax.settings
 
-import android.os.Parcel
 import android.os.Parcelable
-import androidx.core.os.ParcelCompat
-import androidx.core.os.ParcelCompat.readBoolean
+import kotlinx.parcelize.Parcelize
 
 /**
  * Nomenclature settings.
  *
  * @author S. Grimault
  */
+@Parcelize
 data class NomenclatureSettings(
     val saveDefaultValues: Boolean = false,
     val information: List<PropertySettings>,
     val counting: List<PropertySettings>
-) : Parcelable {
-    private constructor(source: Parcel) : this(
-        readBoolean(source),
-        mutableListOf(),
-        mutableListOf()
-    ) {
-        source.readTypedList(
-            information,
-            PropertySettings.CREATOR
-        )
-        source.readTypedList(
-            counting,
-            PropertySettings.CREATOR
-        )
-    }
-
-    override fun describeContents(): Int {
-        return 0
-    }
-
-    override fun writeToParcel(
-        dest: Parcel?,
-        flags: Int
-    ) {
-        dest?.also {
-            ParcelCompat.writeBoolean(
-                it,
-                saveDefaultValues
-            )
-            it.writeTypedList(information)
-            it.writeTypedList(counting)
-        }
-    }
-
-    companion object CREATOR : Parcelable.Creator<NomenclatureSettings> {
-        override fun createFromParcel(parcel: Parcel): NomenclatureSettings {
-            return NomenclatureSettings(parcel)
-        }
-
-        override fun newArray(size: Int): Array<NomenclatureSettings?> {
-            return arrayOfNulls(size)
-        }
-    }
-}
\ No newline at end of file
+) : Parcelable
\ No newline at end of file
diff --git a/occtax/src/main/java/fr/geonature/occtax/settings/PropertySettings.kt b/occtax/src/main/java/fr/geonature/occtax/settings/PropertySettings.kt
index 10ee56ed..bf260846 100644
--- a/occtax/src/main/java/fr/geonature/occtax/settings/PropertySettings.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/settings/PropertySettings.kt
@@ -1,47 +1,16 @@
 package fr.geonature.occtax.settings
 
-import android.os.Parcel
 import android.os.Parcelable
-import androidx.core.os.ParcelCompat
+import kotlinx.parcelize.Parcelize
 
 /**
  * Property settings.
  *
- * @author [S. Grimault](mailto:sebastien.grimault@gmail.com)
+ * @author S. Grimault
  */
+@Parcelize
 data class PropertySettings(
     val key: String,
     val visible: Boolean,
     val default: Boolean
-): Parcelable {
-    private constructor(source: Parcel) : this(
-        source.readString()!!,
-        ParcelCompat.readBoolean(source),
-        ParcelCompat.readBoolean(source)
-    )
-
-    override fun describeContents(): Int {
-        return 0
-    }
-
-    override fun writeToParcel(
-        dest: Parcel?,
-        flags: Int
-    ) {
-        dest?.also {
-            it.writeString(key)
-            ParcelCompat.writeBoolean(it, visible)
-            ParcelCompat.writeBoolean(it, default)
-        }
-    }
-
-    companion object CREATOR : Parcelable.Creator<PropertySettings> {
-        override fun createFromParcel(parcel: Parcel): PropertySettings {
-            return PropertySettings(parcel)
-        }
-
-        override fun newArray(size: Int): Array<PropertySettings?> {
-            return arrayOfNulls(size)
-        }
-    }
-}
\ No newline at end of file
+) : Parcelable
\ No newline at end of file
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/dataset/DatasetListActivity.kt b/occtax/src/main/java/fr/geonature/occtax/ui/dataset/DatasetListActivity.kt
index c921d025..17587b04 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/dataset/DatasetListActivity.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/dataset/DatasetListActivity.kt
@@ -7,6 +7,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import dagger.hilt.android.AndroidEntryPoint
 import fr.geonature.commons.data.entity.Dataset
+import fr.geonature.compat.content.getParcelableExtraCompat
 import fr.geonature.occtax.R
 
 /**
@@ -32,7 +33,7 @@ class DatasetListActivity : AppCompatActivity(),
         supportFragmentManager.beginTransaction()
             .replace(
                 R.id.container,
-                DatasetListFragment.newInstance(intent.getParcelableExtra(EXTRA_SELECTED_DATASET))
+                DatasetListFragment.newInstance(intent.getParcelableExtraCompat(EXTRA_SELECTED_DATASET))
             )
             .commit()
     }
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/dataset/DatasetListFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/dataset/DatasetListFragment.kt
index 736f50de..0d79a0c1 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/dataset/DatasetListFragment.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/dataset/DatasetListFragment.kt
@@ -23,6 +23,7 @@ import fr.geonature.commons.data.ContentProviderAuthority
 import fr.geonature.commons.data.GeoNatureModuleName
 import fr.geonature.commons.data.entity.Dataset
 import fr.geonature.commons.data.helper.ProviderHelper.buildUri
+import fr.geonature.compat.os.getParcelableCompat
 import fr.geonature.occtax.R
 import fr.geonature.occtax.R.layout.fast_scroll_recycler_view
 import javax.inject.Inject
@@ -141,7 +142,7 @@ class DatasetListFragment : Fragment() {
                     view.smoothScrollToPosition(position)
                 }
             })
-            adapter?.setSelectedDataset(arguments?.getParcelable(ARG_SELECTED_DATASET))
+            adapter?.setSelectedDataset(arguments?.getParcelableCompat(ARG_SELECTED_DATASET))
                 .also { updateActionMode(adapter?.getSelectedDataset()) }
 
             with(view) {
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/home/AppSyncView.kt b/occtax/src/main/java/fr/geonature/occtax/ui/home/AppSyncView.kt
deleted file mode 100644
index da0c764f..00000000
--- a/occtax/src/main/java/fr/geonature/occtax/ui/home/AppSyncView.kt
+++ /dev/null
@@ -1,213 +0,0 @@
-package fr.geonature.occtax.ui.home
-
-import android.content.Context
-import android.text.format.DateFormat
-import android.util.AttributeSet
-import android.util.Pair
-import android.view.View
-import android.view.animation.AlphaAnimation
-import android.view.animation.Animation
-import android.widget.TextView
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.content.res.ResourcesCompat
-import androidx.work.WorkInfo
-import fr.geonature.commons.data.entity.AppSync
-import fr.geonature.datasync.packageinfo.PackageInfo
-import fr.geonature.datasync.sync.DataSyncStatus
-import fr.geonature.occtax.R
-import fr.geonature.occtax.ui.shared.view.ListItemActionView
-import java.text.NumberFormat
-
-/**
- * Custom [View] about [AppSync].
- *
- * @author S. Grimault
- */
-class AppSyncView : ConstraintLayout {
-
-    private lateinit var iconStatus: TextView
-    private lateinit var listItemActionView: ListItemActionView
-    private var listener: OnAppSyncViewListener? = null
-
-    private val stateAnimation = AlphaAnimation(
-        0.0f,
-        1.0f
-    ).apply {
-        duration = 250
-        startOffset = 10
-        repeatMode = Animation.REVERSE
-        repeatCount = Animation.INFINITE
-    }
-
-    constructor(context: Context) : super(context) {
-        init()
-    }
-
-    constructor(
-        context: Context,
-        attrs: AttributeSet
-    ) : super(
-        context,
-        attrs
-    ) {
-        init()
-    }
-
-    constructor(
-        context: Context,
-        attrs: AttributeSet,
-        defStyleAttr: Int
-    ) : super(
-        context,
-        attrs,
-        defStyleAttr
-    ) {
-        init()
-    }
-
-    fun setListener(listener: OnAppSyncViewListener) {
-        this.listener = listener
-    }
-
-    fun enableActionButton(enabled: Boolean = true) {
-        listItemActionView.enableActionButton(enabled)
-    }
-
-    fun setDataSyncStatus(dataSyncStatus: DataSyncStatus?) {
-        when (dataSyncStatus?.state ?: WorkInfo.State.ENQUEUED) {
-            WorkInfo.State.RUNNING -> {
-                iconStatus.setTextColor(
-                    ResourcesCompat.getColor(
-                        resources,
-                        R.color.datasync_status_pending,
-                        context?.theme
-                    )
-                )
-
-                if (iconStatus.animation?.hasStarted() != true) {
-                    iconStatus.startAnimation(stateAnimation)
-                }
-            }
-            WorkInfo.State.FAILED -> {
-                iconStatus.setTextColor(
-                    ResourcesCompat.getColor(
-                        resources,
-                        R.color.datasync_status_ko,
-                        context?.theme
-                    )
-                )
-                iconStatus.clearAnimation()
-            }
-            WorkInfo.State.SUCCEEDED -> {
-                iconStatus.setTextColor(
-                    ResourcesCompat.getColor(
-                        resources,
-                        R.color.datasync_status_ok,
-                        context?.theme
-                    )
-                )
-                iconStatus.clearAnimation()
-            }
-            else -> {
-                iconStatus.setTextColor(
-                    ResourcesCompat.getColor(
-                        resources,
-                        R.color.datasync_status_unknown,
-                        context?.theme
-                    )
-                )
-                iconStatus.clearAnimation()
-            }
-        }
-
-        listItemActionView.set(
-            Pair.create(
-                context.getString(R.string.sync_data),
-                dataSyncStatus?.syncMessage
-            ),
-            0
-        )
-    }
-
-    fun setPackageInfo(packageInfo: PackageInfo) {
-        val numberOfInputsToSynchronize = packageInfo.inputsStatus?.inputs ?: return
-
-        listItemActionView.set(
-            Pair.create(
-                context.getString(R.string.sync_inputs_not_synchronized),
-                NumberFormat.getInstance().format(numberOfInputsToSynchronize)
-            ),
-            2
-        )
-    }
-
-    fun setAppSync(appSync: AppSync?) {
-        if (appSync == null) {
-            return
-        }
-
-        listItemActionView.set(
-            Pair.create(
-                context.getString(R.string.sync_last_synchronization),
-                if (appSync.lastSync == null) context.getString(R.string.sync_last_synchronization_never)
-                else DateFormat.format(
-                    context.getString(R.string.sync_last_synchronization_date),
-                    appSync.lastSync!!
-                ).toString()
-            ),
-            1
-        )
-        listItemActionView.set(
-            Pair.create(
-                context.getString(R.string.sync_inputs_not_synchronized),
-                NumberFormat.getInstance().format(appSync.inputsToSynchronize)
-            ),
-            2
-        )
-    }
-
-    private fun init() {
-        View.inflate(
-            context,
-            R.layout.view_app_sync,
-            this
-        )
-
-        iconStatus = findViewById(android.R.id.icon)
-        listItemActionView = findViewById<ListItemActionView?>(R.id.list_item).also {
-            it.setListener(object : ListItemActionView.OnListItemActionViewListener {
-                override fun onAction() {
-                    listener?.onAction()
-                }
-            })
-
-            it.setItems(
-                listOf(
-                    Pair.create(
-                        context.getString(R.string.sync_data),
-                        null
-                    ),
-                    Pair.create(
-                        context.getString(R.string.sync_last_synchronization),
-                        context.getString(R.string.sync_last_synchronization_never)
-                    ),
-                    Pair.create(
-                        context.getString(R.string.sync_inputs_not_synchronized),
-                        NumberFormat.getInstance().format(0)
-                    )
-                )
-            )
-        }
-    }
-
-    /**
-     * Callback used by [AppSyncView].
-     */
-    interface OnAppSyncViewListener {
-
-        /**
-         * Called when the 'synchronize' button has been clicked.
-         */
-        fun onAction()
-    }
-}
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/home/DrawerMenuEntryView.kt b/occtax/src/main/java/fr/geonature/occtax/ui/home/DrawerMenuEntryView.kt
new file mode 100644
index 00000000..1054835b
--- /dev/null
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/home/DrawerMenuEntryView.kt
@@ -0,0 +1,136 @@
+package fr.geonature.occtax.ui.home
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextSwitcher
+import android.widget.TextView
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.constraintlayout.widget.ConstraintLayout
+import fr.geonature.occtax.R
+
+/**
+ * Generic [View] about drawer menu entry.
+ *
+ * @author S. Grimault
+ */
+class DrawerMenuEntryView : ConstraintLayout {
+
+    lateinit var icon: ImageView
+        private set
+
+    private lateinit var textView1: TextView
+    private lateinit var textView2: TextSwitcher
+
+    constructor(context: Context) : super(context) {
+        init(
+            null,
+            0
+        )
+    }
+
+    constructor(
+        context: Context,
+        attrs: AttributeSet
+    ) : super(
+        context,
+        attrs
+    ) {
+        init(
+            attrs,
+            0
+        )
+    }
+
+    constructor(
+        context: Context,
+        attrs: AttributeSet,
+        defStyleAttr: Int
+    ) : super(
+        context,
+        attrs,
+        defStyleAttr
+    ) {
+        init(
+            attrs,
+            defStyleAttr
+        )
+    }
+
+    fun setIcon(@DrawableRes drawableResourceId: Int) {
+        icon.setImageResource(drawableResourceId)
+    }
+
+    fun setText1(@StringRes textResourceId: Int) {
+        setText1(if (textResourceId == 0) null else context.getString(textResourceId))
+    }
+
+    fun setText1(title: String?) {
+        textView1.text = title
+    }
+
+    fun setText2(@StringRes textResourceId: Int) {
+        setText2(if (textResourceId == 0) null else context.getString(textResourceId))
+    }
+
+    fun setText2(text: String?) {
+        textView2.setText(text)
+        textView2.visibility = if (text.isNullOrBlank()) GONE else VISIBLE
+    }
+
+    private fun init(
+        attrs: AttributeSet?,
+        defStyle: Int
+    ) {
+        View.inflate(
+            context,
+            R.layout.view_drawer_menu_entry,
+            this
+        )
+
+        icon = findViewById(android.R.id.icon)
+        textView1 = findViewById(android.R.id.text1)
+        textView2 = findViewById(android.R.id.text2)
+
+        // load attributes
+        val ta = context.obtainStyledAttributes(
+            attrs,
+            R.styleable.DrawerMenuEntryView,
+            defStyle,
+            0
+        )
+
+        setIcon(
+            ta.getResourceId(
+                R.styleable.DrawerMenuEntryView_icon,
+                0
+            )
+        )
+
+        ta.getString(R.styleable.DrawerMenuEntryView_text1)
+            ?.also {
+                setText1(it)
+            }
+        setText1(
+            ta.getResourceId(
+                R.styleable.DrawerMenuEntryView_text1,
+                0
+            )
+        )
+
+        ta.getString(R.styleable.DrawerMenuEntryView_text2)
+            ?.also {
+                setText2(it)
+            }
+        setText2(
+            ta.getResourceId(
+                R.styleable.DrawerMenuEntryView_text2,
+                0
+            )
+        )
+
+        ta.recycle()
+    }
+}
\ No newline at end of file
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/home/HomeActivity.kt b/occtax/src/main/java/fr/geonature/occtax/ui/home/HomeActivity.kt
index 67bedbf5..fa00d971 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/home/HomeActivity.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/home/HomeActivity.kt
@@ -1,53 +1,38 @@
 package fr.geonature.occtax.ui.home
 
-import android.annotation.SuppressLint
 import android.content.Intent
-import android.database.Cursor
 import android.os.Bundle
-import android.os.VibrationEffect
-import android.os.Vibrator
-import android.view.Menu
-import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import android.view.animation.AnimationUtils
+import android.view.animation.Animation
+import android.view.animation.LinearInterpolator
+import android.view.animation.RotateAnimation
+import android.widget.Button
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
+import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.view.menu.MenuBuilder
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
-import androidx.core.os.bundleOf
-import androidx.core.view.children
-import androidx.loader.app.LoaderManager
-import androidx.loader.content.CursorLoader
-import androidx.loader.content.Loader
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
+import androidx.drawerlayout.widget.DrawerLayout
 import androidx.work.WorkInfo
-import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 import com.google.android.material.progressindicator.CircularProgressIndicator
 import com.google.android.material.snackbar.BaseTransientBottomBar
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
-import fr.geonature.commons.data.ContentProviderAuthority
-import fr.geonature.commons.data.entity.AppSync
-import fr.geonature.commons.data.helper.ProviderHelper.buildUri
 import fr.geonature.commons.error.Failure
 import fr.geonature.commons.lifecycle.observe
 import fr.geonature.commons.lifecycle.observeOnce
 import fr.geonature.commons.lifecycle.observeUntil
 import fr.geonature.commons.lifecycle.onFailure
-import fr.geonature.commons.ui.adapter.AbstractListItemRecyclerViewAdapter
 import fr.geonature.commons.util.ThemeUtils.getErrorColor
 import fr.geonature.datasync.api.IGeoNatureAPIClient
+import fr.geonature.datasync.api.model.AuthLogin
 import fr.geonature.datasync.auth.AuthLoginViewModel
 import fr.geonature.datasync.features.settings.presentation.ConfigureServerSettingsActivity
 import fr.geonature.datasync.features.settings.presentation.ConfigureServerSettingsViewModel
@@ -65,13 +50,14 @@ import fr.geonature.occtax.BuildConfig
 import fr.geonature.occtax.MainApplication
 import fr.geonature.occtax.R
 import fr.geonature.occtax.features.record.domain.ObservationRecord
-import fr.geonature.occtax.features.record.presentation.ObservationRecordViewModel
 import fr.geonature.occtax.settings.AppSettings
 import fr.geonature.occtax.settings.AppSettingsViewModel
 import fr.geonature.occtax.ui.input.InputPagerFragmentActivity
 import fr.geonature.occtax.ui.settings.PreferencesActivity
 import org.tinylog.Logger
 import java.io.File
+import java.text.DateFormat
+import java.util.Date
 import javax.inject.Inject
 
 /**
@@ -80,7 +66,8 @@ import javax.inject.Inject
  * @author S. Grimault
  */
 @AndroidEntryPoint
-class HomeActivity : AppCompatActivity() {
+class HomeActivity : AppCompatActivity(),
+    LastObservationRecordsFragment.OnLastObservationRecordsFragmentListener {
 
     private val authLoginViewModel: AuthLoginViewModel by viewModels()
     private val appSettingsViewModel: AppSettingsViewModel by viewModels()
@@ -88,228 +75,120 @@ class HomeActivity : AppCompatActivity() {
     private val dataSyncViewModel: DataSyncViewModel by viewModels()
     private val configureServerSettingsViewModel: ConfigureServerSettingsViewModel by viewModels()
     private val updateSettingsViewModel: UpdateSettingsViewModel by viewModels()
-    private val observationRecordViewModel: ObservationRecordViewModel by viewModels()
 
     @Inject
     lateinit var geoNatureAPIClient: IGeoNatureAPIClient
 
-    @ContentProviderAuthority
-    @Inject
-    lateinit var authority: String
-
+    private var loginLastnameTextView: TextView? = null
+    private var loginFirstnameTextView: TextView? = null
+    private var loginButton: Button? = null
+    private var navMenuDataSync: DrawerMenuEntryView? = null
+    private var navMenuLogout: DrawerMenuEntryView? = null
     private var homeContent: CoordinatorLayout? = null
-    private var appSyncView: AppSyncView? = null
-    private var inputToolbar: Toolbar? = null
-    private var inputRecyclerView: RecyclerView? = null
-    private var inputEmptyTextView: TextView? = null
-    private var fab: ExtendedFloatingActionButton? = null
-
-    private lateinit var adapter: InputRecyclerViewAdapter
     private var progressSnackbar: Pair<Snackbar, CircularProgressIndicator>? = null
 
     private var appSettings: AppSettings? = null
-    private var isLoggedIn: Boolean = false
+    private var isLoggedIn: AuthLogin? = null
 
     private lateinit var startSyncResultLauncher: ActivityResultLauncher<Intent>
 
-    private val loaderCallbacks = object : LoaderManager.LoaderCallbacks<Cursor> {
-        override fun onCreateLoader(
-            id: Int,
-            args: Bundle?
-        ): Loader<Cursor> {
-            return when (id) {
-                LOADER_APP_SYNC -> CursorLoader(
-                    this@HomeActivity,
-                    buildUri(
-                        authority,
-                        AppSync.TABLE_NAME,
-                        args?.getString(AppSync.COLUMN_ID)
-                            ?: ""
-                    ),
-                    null,
-                    null,
-                    null,
-                    null
-                )
-                else -> throw IllegalArgumentException()
-            }
-        }
-
-        override fun onLoadFinished(
-            loader: Loader<Cursor>,
-            data: Cursor?
-        ) {
-
-            if (data == null) {
-                Logger.warn { "failed to load data from '${(loader as CursorLoader).uri}'" }
-
-                return
-            }
-
-            when (loader.id) {
-                LOADER_APP_SYNC -> {
-                    if (data.moveToFirst()) {
-                        appSyncView?.setAppSync(AppSync.fromCursor(data))
-                    }
-                }
-            }
-        }
-
-        override fun onLoaderReset(loader: Loader<Cursor>) {
-            // nothing to do...
-        }
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setContentView(R.layout.activity_home)
 
-        homeContent = findViewById(R.id.homeContent)
-        appSyncView = findViewById(R.id.appSyncView)
-
-        inputToolbar = findViewById<Toolbar?>(R.id.toolbar_inputs).apply {
-            inflateMenu(R.menu.status)
-            // all statuses checked by default
-            menu.children.forEach { it.isChecked = true }
-            setOnMenuItemClickListener { menuItem ->
-                when (menuItem.itemId) {
-                    R.id.menu_status_draft -> {
-                        menuItem.isChecked = !menuItem.isChecked
-
-                        if (menu.children.all { !it.isChecked }) {
-                            menu.children.forEach { it.isChecked = true }
-                        }
-
-                        loadObservationRecords()
+        // setting a custom ActionBar
+        val toolbar: Toolbar = findViewById(R.id.toolbar)
+        setSupportActionBar(toolbar)
 
-                        true
-                    }
-                    R.id.menu_status_to_sync -> {
-                        menuItem.isChecked = !menuItem.isChecked
-
-                        if (menu.children.all { !it.isChecked }) {
-                            menu.children.forEach { it.isChecked = true }
-                        }
-
-                        loadObservationRecords()
+        supportActionBar?.apply {
+            // showing the burger button on the ActionBar
+            setDisplayHomeAsUpEnabled(true)
+            subtitle = getString(R.string.home_last_inputs)
+        }
 
-                        true
+        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
+        val toggle =
+            ActionBarDrawerToggle(
+                this,
+                drawerLayout,
+                toolbar,
+                R.string.home_drawer_open,
+                R.string.home_drawer_close
+            )
+        drawerLayout.addDrawerListener(toggle)
+        toggle.syncState()
+
+        findViewById<ViewGroup>(R.id.nav_header)?.also {
+            loginLastnameTextView = it.findViewById(android.R.id.text1)
+            loginFirstnameTextView = it.findViewById(android.R.id.text2)
+            loginButton = it.findViewById<Button?>(android.R.id.button1)
+                ?.apply {
+                    setOnClickListener {
+                        startSyncResultLauncher.launch(LoginActivity.newIntent(this@HomeActivity))
+                        drawerLayout.close()
                     }
-                    else -> false
                 }
+        }
+        findViewById<DrawerMenuEntryView>(R.id.nav_menu_settings)?.also {
+            it.setOnClickListener {
+                startSyncResultLauncher.launch(
+                    PreferencesActivity.newIntent(
+                        this,
+                        appSettings
+                    )
+                )
+                drawerLayout.close()
             }
         }
-
-        inputRecyclerView = findViewById(R.id.inputRecyclerView)
-        inputEmptyTextView = findViewById(R.id.inputEmptyTextView)
-        fab = findViewById(R.id.fab)
-
-        configureAuthLoginViewModel()
-        configurePackageInfoViewModel()
-        configureDataSyncViewModel()
-        configureConfigureServerSettingsViewModel()
-        configureUpdateSettingsViewModel()
-        configureObservationRecordViewModel()
-
-        appSyncView?.setListener(object : AppSyncView.OnAppSyncViewListener {
-            override fun onAction() {
-                appSettings?.dataSyncSettings?.run {
+        navMenuDataSync = findViewById<DrawerMenuEntryView>(R.id.nav_menu_sync)?.also {
+            it.setOnClickListener {
+                appSettings?.dataSyncSettings?.also { dataSyncSettings ->
                     dataSyncViewModel.startSync(
-                        this,
+                        dataSyncSettings,
                         HomeActivity::class.java,
                         MainApplication.CHANNEL_DATA_SYNCHRONIZATION
                     )
-                    packageInfoViewModel.getAllApplications()
-                    packageInfoViewModel.synchronizeInstalledApplications()
                 }
             }
-        })
-
-        fab?.setOnClickListener {
-            val appSettings = appSettings ?: return@setOnClickListener
-
-            startInput(appSettings)
         }
-
-        adapter = InputRecyclerViewAdapter(object :
-            AbstractListItemRecyclerViewAdapter.OnListItemRecyclerViewAdapterListener<ObservationRecord> {
-            override fun onClick(item: ObservationRecord) {
-                val appSettings = appSettings ?: return
-
-                Logger.info { "input selected: ${item.id}" }
-
-                startInput(
-                    appSettings,
-                    item
-                )
-            }
-
-            override fun onLongClicked(
-                position: Int,
-                item: ObservationRecord
-            ) {
-                ContextCompat.getSystemService(
-                    this@HomeActivity,
-                    Vibrator::class.java
-                )
-                    ?.vibrate(
-                        VibrationEffect.createOneShot(
-                            100,
-                            VibrationEffect.DEFAULT_AMPLITUDE
-                        )
-                    )
-
-                AlertDialog.Builder(this@HomeActivity)
-                    .setTitle(R.string.alert_dialog_input_delete_title)
-                    .setPositiveButton(
-                        R.string.alert_dialog_ok
-                    ) { dialog, _ ->
-                        observationRecordViewModel.delete(item)
-                        dialog.dismiss()
+        navMenuLogout = findViewById<DrawerMenuEntryView>(R.id.nav_menu_logout)?.also {
+            it.setOnClickListener {
+                authLoginViewModel
+                    .logout()
+                    .observe(
+                        this
+                    ) {
+                        Toast
+                            .makeText(
+                                this,
+                                R.string.toast_logout_success,
+                                Toast.LENGTH_SHORT
+                            )
+                            .show()
                     }
-                    .setNegativeButton(
-                        R.string.alert_dialog_cancel
-                    ) { dialog, _ -> dialog.dismiss() }
-                    .show()
-            }
-
-            override fun showEmptyTextView(show: Boolean) {
-                if (inputEmptyTextView?.visibility == View.VISIBLE == show) {
-                    return
-                }
-
-                if (show) {
-                    inputEmptyTextView?.startAnimation(
-                        AnimationUtils.loadAnimation(
-                            this@HomeActivity,
-                            android.R.anim.fade_in
-                        )
-                    )
-                    inputEmptyTextView?.visibility = View.VISIBLE
-                } else {
-                    inputEmptyTextView?.startAnimation(
-                        AnimationUtils.loadAnimation(
-                            this@HomeActivity,
-                            android.R.anim.fade_out
-                        )
-                    )
-                    inputEmptyTextView?.visibility = View.GONE
-                }
+                drawerLayout.close()
             }
-        })
-
-        inputRecyclerView?.apply {
-            layoutManager = LinearLayoutManager(context)
-            adapter = this@HomeActivity.adapter
-
-            val dividerItemDecoration = DividerItemDecoration(
-                context,
-                (layoutManager as LinearLayoutManager).orientation
+        }
+        findViewById<DrawerMenuEntryView>(R.id.nav_menu_about)?.also {
+            it.setText2(
+                getString(
+                    R.string.app_version,
+                    BuildConfig.VERSION_NAME,
+                    BuildConfig.VERSION_CODE,
+                    DateFormat.getDateTimeInstance()
+                        .format(Date(BuildConfig.BUILD_DATE.toLong()))
+                )
             )
-            addItemDecoration(dividerItemDecoration)
         }
 
+        homeContent = findViewById(R.id.homeContent)
+
+        configureAuthLoginViewModel()
+        configureDataSyncViewModel()
+        configureConfigureServerSettingsViewModel()
+        configureUpdateSettingsViewModel()
+
         startSyncResultLauncher =
             registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
                 when (result.resultCode) {
@@ -317,7 +196,7 @@ class HomeActivity : AppCompatActivity() {
                         val dataSyncSettings = appSettings?.dataSyncSettings
 
                         if (dataSyncSettings == null || geoNatureAPIClient.getBaseUrls().geoNatureBaseUrl != dataSyncSettings.geoNatureServerUrl) {
-                            configureServerSettingsViewModel.loadAppSettings(geoNatureAPIClient.getBaseUrls().geoNatureBaseUrl)
+                             configureServerSettingsViewModel.loadAppSettings(geoNatureAPIClient.getBaseUrls().geoNatureBaseUrl)
                         } else {
                             dataSyncViewModel.startSync(
                                 dataSyncSettings,
@@ -332,93 +211,14 @@ class HomeActivity : AppCompatActivity() {
         updateSettingsViewModel.updateAppSettings()
     }
 
-    override fun onResume() {
-        super.onResume()
-
-        loadAppSync()
-
-        appSettings?.run {
-            loadObservationRecords()
-        }
-    }
-
-    @SuppressLint("RestrictedApi")
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        menuInflater.inflate(
-            R.menu.settings,
-            menu
-        )
-        menuInflater.inflate(
-            R.menu.login,
-            menu
-        )
-
-        if (menu is MenuBuilder) {
-            menu.setOptionalIconsVisible(true)
-        }
-
-        return true
-    }
-
-    override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
-        menu?.run {
-            findItem(R.id.menu_login)?.also {
-                it.isEnabled = appSettings != null
-                it.isVisible = !isLoggedIn
-            }
-            findItem(R.id.menu_logout)?.also {
-                it.isEnabled = appSettings != null
-                it.isVisible = isLoggedIn
-            }
-        }
-
-        return super.onPrepareOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.menu_settings -> {
-                startSyncResultLauncher.launch(
-                    PreferencesActivity.newIntent(
-                        this,
-                        appSettings
-                    )
-                )
-                true
-            }
-            R.id.menu_login -> {
-                startSyncResultLauncher.launch(LoginActivity.newIntent(this))
-                true
-            }
-            R.id.menu_logout -> {
-                authLoginViewModel
-                    .logout()
-                    .observe(
-                        this
-                    ) {
-                        Toast
-                            .makeText(
-                                this,
-                                R.string.toast_logout_success,
-                                Toast.LENGTH_SHORT
-                            )
-                            .show()
-                    }
-                true
-            }
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
+    override fun onStartEditObservationRecord(selectedObservationRecord: ObservationRecord?) {
+        val appSettings = appSettings ?: return
 
-    private fun startInput(
-        appSettings: AppSettings,
-        observationRecord: ObservationRecord? = null
-    ) {
         startActivity(
             InputPagerFragmentActivity.newIntent(
                 this,
                 appSettings,
-                observationRecord
+                selectedObservationRecord
             )
         )
     }
@@ -438,19 +238,29 @@ class HomeActivity : AppCompatActivity() {
                 this@HomeActivity
             ) {
                 this@HomeActivity.isLoggedIn = it
-                invalidateOptionsMenu()
+                loginLastnameTextView?.apply {
+                    text = it?.user?.lastname
+                    visibility = if (it == null) View.GONE else View.VISIBLE
+                }
+                loginFirstnameTextView?.apply {
+                    text = it?.user?.firstname
+                    visibility = if (it == null) View.GONE else View.VISIBLE
+                }
+                loginButton?.visibility = if (it == null) View.VISIBLE else View.GONE
+                navMenuLogout?.visibility = if (it == null) View.GONE else View.VISIBLE
             }
-        }
-    }
+            vm.loginResult.observe(this@HomeActivity) { result ->
+                result.success?.also {
+                    loginLastnameTextView?.text = it.user.lastname
+                    loginFirstnameTextView?.text = it.user.firstname
+                }
 
-    private fun configurePackageInfoViewModel() {
-        with(packageInfoViewModel) {
-            observe(packageInfos) {
-                it.find { packageInfo -> packageInfo.packageName == BuildConfig.APPLICATION_ID }
-                    ?.also { packageInfo ->
-                        appSyncView?.setPackageInfo(packageInfo)
-                        loadObservationRecords()
-                    }
+                loginLastnameTextView?.visibility =
+                    if (result.success == null) View.GONE else View.VISIBLE
+                loginFirstnameTextView?.visibility =
+                    if (result.success == null) View.GONE else View.VISIBLE
+                loginButton?.visibility = if (result.success == null) View.VISIBLE else View.GONE
+                navMenuLogout?.visibility = if (result.success == null) View.GONE else View.VISIBLE
             }
         }
     }
@@ -460,8 +270,21 @@ class HomeActivity : AppCompatActivity() {
             vm.isSyncRunning.observe(
                 this@HomeActivity
             ) {
-                appSyncView?.enableActionButton(!it)
-                invalidateOptionsMenu()
+                navMenuDataSync?.apply {
+                    isClickable = !it
+                    setText1(R.string.action_data_sync)
+                }
+            }
+            vm.lastSynchronizedDate.observe(this@HomeActivity) { syncState ->
+                navMenuDataSync?.setText2(getString(
+                    R.string.sync_last_synchronization,
+                    syncState?.second?.let {
+                        android.text.format.DateFormat.format(
+                            getString(R.string.sync_last_synchronization_date),
+                            it
+                        )
+                    } ?: getString(R.string.sync_last_synchronization_never)
+                ))
             }
             vm
                 .observeDataSyncStatus()
@@ -469,11 +292,52 @@ class HomeActivity : AppCompatActivity() {
                     this@HomeActivity
                 ) {
                     if (it == null) {
-                        appSyncView?.setDataSyncStatus(null)
+                        navMenuDataSync?.apply {
+                            icon.clearAnimation()
+                        }
                     }
 
                     it?.run {
-                        appSyncView?.setDataSyncStatus(this)
+                        when (state) {
+                            WorkInfo.State.RUNNING -> {
+                                navMenuDataSync?.apply {
+                                    if (icon.animation == null) {
+                                        setIcon(R.drawable.ic_sync)
+                                        icon.startAnimation(
+                                            RotateAnimation(
+                                                0F,
+                                                -360F,
+                                                Animation.RELATIVE_TO_SELF,
+                                                0.5F,
+                                                Animation.RELATIVE_TO_SELF,
+                                                0.5F
+                                            ).apply {
+                                                interpolator = LinearInterpolator()
+                                                duration = 900
+                                                repeatCount = Animation.INFINITE
+                                            }
+                                        )
+                                    }
+                                }
+                            }
+                            WorkInfo.State.FAILED -> {
+                                navMenuDataSync?.apply {
+                                    icon.clearAnimation()
+                                    setIcon(R.drawable.ic_sync_problem)
+                                }
+                            }
+                            else -> {
+                                navMenuDataSync?.apply {
+                                    icon.clearAnimation()
+                                    setIcon(R.drawable.ic_sync)
+                                }
+                            }
+                        }
+
+                        navMenuDataSync?.apply {
+                            setText1(R.string.action_data_sync_in_progress)
+                            setText2(syncMessage)
+                        }
 
                         if (it.serverStatus == ServerStatus.UNAUTHORIZED) {
                             Logger.info { "not connected (HTTP error code: 401), redirect to ${LoginActivity::class.java.name}" }
@@ -524,35 +388,12 @@ class HomeActivity : AppCompatActivity() {
         }
     }
 
-    private fun configureObservationRecordViewModel() {
-        with(observationRecordViewModel) {
-            observe(
-                observationRecords,
-                ::handleObservationRecords
-            )
-        }
-    }
-
-    private fun loadAppSync() {
-        LoaderManager.getInstance(this)
-            .restartLoader(
-                LOADER_APP_SYNC,
-                bundleOf(AppSync.COLUMN_ID to packageName),
-                loaderCallbacks
-            )
-    }
-
     private fun loadAppSettings() {
         appSettingsViewModel.loadAppSettings()
             .observeOnce(this) {
                 if (it?.mapSettings == null) {
                     Logger.info { "failed to load settings" }
 
-                    fab?.hide()
-                    adapter.clear()
-                    appSyncView?.enableActionButton(false)
-                    invalidateOptionsMenu()
-
                     makeSnackbar(
                         getString(
                             if (it == null) R.string.snackbar_settings_not_found else R.string.snackbar_settings_map_invalid,
@@ -563,9 +404,6 @@ class HomeActivity : AppCompatActivity() {
                     Logger.info { "app settings successfully loaded" }
 
                     appSettings = it
-                    fab?.show()
-                    appSyncView?.enableActionButton(it.dataSyncSettings != null)
-                    invalidateOptionsMenu()
 
                     it.dataSyncSettings?.also { dataSyncSettings ->
                         dataSyncViewModel.configurePeriodicSync(
@@ -574,28 +412,10 @@ class HomeActivity : AppCompatActivity() {
                             MainApplication.CHANNEL_DATA_SYNCHRONIZATION
                         )
                     }
-
-                    loadObservationRecords()
                 }
             }
     }
 
-    private fun loadObservationRecords() {
-        val filter = inputToolbar?.menu?.children?.filter { it.isChecked }
-            ?.map {
-                when (it.itemId) {
-                    R.id.menu_status_to_sync -> ObservationRecord.Status.TO_SYNC
-                    else -> ObservationRecord.Status.DRAFT
-                }
-            }
-            ?.toList() ?: listOf(
-            ObservationRecord.Status.DRAFT,
-            ObservationRecord.Status.TO_SYNC
-        )
-
-        observationRecordViewModel.getAll { input -> filter.any { input.status == it } }
-    }
-
     private fun packageInfoUpdated(packageInfo: PackageInfo) {
         if (packageInfo.hasNewVersionAvailable()) {
             confirmBeforeUpgrade(this.packageName)
@@ -608,17 +428,7 @@ class HomeActivity : AppCompatActivity() {
         loadAppSettings()
     }
 
-    private fun handleObservationRecords(observationRecords: List<ObservationRecord>) {
-        loadAppSync()
-        adapter.setItems(observationRecords)
-    }
-
     private fun handleFailure(failure: Failure) {
-        fab?.hide()
-        adapter.clear()
-        appSyncView?.enableActionButton(false)
-        invalidateOptionsMenu()
-
         when (failure) {
             is Failure.NetworkFailure -> {
                 makeSnackbar(failure.reason)
@@ -796,8 +606,4 @@ class HomeActivity : AppCompatActivity() {
 
         startActivity(install)
     }
-
-    companion object {
-        private const val LOADER_APP_SYNC = 1
-    }
 }
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/home/LastObservationRecordsFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/home/LastObservationRecordsFragment.kt
new file mode 100644
index 00000000..1051a429
--- /dev/null
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/home/LastObservationRecordsFragment.kt
@@ -0,0 +1,369 @@
+package fr.geonature.occtax.ui.home
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.os.Bundle
+import android.os.VibrationEffect
+import android.os.Vibrator
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.animation.AnimationUtils
+import android.widget.ProgressBar
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.viewModels
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+import dagger.hilt.android.AndroidEntryPoint
+import fr.geonature.commons.lifecycle.observe
+import fr.geonature.commons.ui.adapter.AbstractListItemRecyclerViewAdapter
+import fr.geonature.commons.util.ThemeUtils.getColor
+import fr.geonature.datasync.sync.DataSyncViewModel
+import fr.geonature.occtax.R
+import fr.geonature.occtax.features.record.domain.ObservationRecord
+import fr.geonature.occtax.features.record.presentation.ObservationRecordViewModel
+import fr.geonature.occtax.settings.AppSettings
+import fr.geonature.occtax.settings.AppSettingsViewModel
+import org.tinylog.Logger
+
+/**
+ * [Fragment] to show all current [ObservationRecord].
+ *
+ * @author S. Grimault
+ */
+@AndroidEntryPoint
+class LastObservationRecordsFragment : Fragment(R.layout.fragment_recycler_view_fab) {
+
+    private val appSettingsViewModel: AppSettingsViewModel by activityViewModels()
+    private val dataSyncViewModel: DataSyncViewModel by activityViewModels()
+    private val observationRecordViewModel: ObservationRecordViewModel by viewModels()
+
+    private var emptyTextView: TextView? = null
+    private var fab: ExtendedFloatingActionButton? = null
+    private var listener: OnLastObservationRecordsFragmentListener? = null
+    private var adapter: ObservationRecordRecyclerViewAdapter? = null
+    private var statusesFilter: MutableList<ObservationRecord.Status> = mutableListOf(
+        ObservationRecord.Status.DRAFT,
+        ObservationRecord.Status.TO_SYNC
+    )
+    private var appSettings: AppSettings? = null
+    private var isSyncRunning = false
+    private var hasObservationRecordsReadyToSynchronize = false
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?
+    ) {
+        activity?.actionBar?.subtitle = getString(R.string.home_last_inputs)
+
+        // we have a menu item to show in action bar
+        setHasOptionsMenu(true)
+
+        val recyclerView = view.findViewById<RecyclerView>(android.R.id.list)
+        emptyTextView = view.findViewById<TextView>(android.R.id.empty)
+            .apply {
+                text = getString(R.string.home_no_input)
+            }
+        val progressBar = view.findViewById<ProgressBar>(android.R.id.progress)
+            .apply { visibility = View.VISIBLE }
+
+        adapter = ObservationRecordRecyclerViewAdapter(object :
+            AbstractListItemRecyclerViewAdapter.OnListItemRecyclerViewAdapterListener<ObservationRecord> {
+            override fun onClick(item: ObservationRecord) {
+                Logger.info { "observation record selected: ${item.id}" }
+
+                listener?.onStartEditObservationRecord(item)
+            }
+
+            override fun onLongClicked(
+                position: Int,
+                item: ObservationRecord
+            ) {
+                val context = context ?: return
+
+                ContextCompat.getSystemService(
+                    context,
+                    Vibrator::class.java
+                )
+                    ?.vibrate(
+                        VibrationEffect.createOneShot(
+                            100,
+                            VibrationEffect.DEFAULT_AMPLITUDE
+                        )
+                    )
+
+                AlertDialog.Builder(context)
+                    .setTitle(R.string.alert_dialog_input_delete_title)
+                    .setPositiveButton(
+                        R.string.alert_dialog_ok
+                    ) { dialog, _ ->
+                        observationRecordViewModel.delete(item)
+                        dialog.dismiss()
+                    }
+                    .setNegativeButton(
+                        R.string.alert_dialog_cancel
+                    ) { dialog, _ -> dialog.dismiss() }
+                    .show()
+            }
+
+            override fun showEmptyTextView(show: Boolean) {
+                progressBar?.visibility = View.GONE
+
+                if (emptyTextView?.visibility == View.VISIBLE == show) {
+                    return
+                }
+
+                if (show) {
+                    emptyTextView?.startAnimation(
+                        AnimationUtils.loadAnimation(
+                            context,
+                            android.R.anim.fade_in
+                        )
+                    )
+                    emptyTextView?.visibility = View.VISIBLE
+                } else {
+                    emptyTextView?.startAnimation(
+                        AnimationUtils.loadAnimation(
+                            context,
+                            android.R.anim.fade_out
+                        )
+                    )
+                    emptyTextView?.visibility = View.GONE
+                }
+            }
+        })
+
+        fab = view.findViewById<ExtendedFloatingActionButton?>(R.id.fab)
+            ?.apply {
+                hide()
+                text = getString(R.string.action_new_input)
+                extend()
+                setOnClickListener { listener?.onStartEditObservationRecord() }
+            }
+
+        with(recyclerView) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = this@LastObservationRecordsFragment.adapter
+
+            val dividerItemDecoration = DividerItemDecoration(
+                context,
+                (layoutManager as LinearLayoutManager).orientation
+            )
+            addItemDecoration(dividerItemDecoration)
+        }
+
+        configureAppSettingsViewModel()
+        configureDataSyncViewModel()
+        configureObservationRecordViewModel()
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        appSettings?.run {
+            loadObservationRecords()
+        }
+    }
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+
+        context.takeIf { it is OnLastObservationRecordsFragmentListener }
+            ?.let { it as OnLastObservationRecordsFragmentListener }
+            ?.also {
+                listener = it
+            } ?: throw RuntimeException(
+            "$context must implement ${OnLastObservationRecordsFragmentListener::class.java.simpleName}"
+        )
+    }
+
+    override fun onCreateOptionsMenu(
+        menu: Menu,
+        inflater: MenuInflater
+    ) {
+        super.onCreateOptionsMenu(
+            menu,
+            inflater
+        )
+
+        with(inflater) {
+            inflate(
+                R.menu.sync,
+                menu
+            )
+            inflate(
+                R.menu.status,
+                menu
+            )
+        }
+    }
+
+    override fun onPrepareOptionsMenu(menu: Menu) {
+        super.onPrepareOptionsMenu(menu)
+
+        menu.findItem(R.id.menu_sync)
+            ?.apply {
+                isVisible = !isSyncRunning
+                isEnabled = hasObservationRecordsReadyToSynchronize
+            }
+        menu.findItem(R.id.menu_sync_in_progress)
+            ?.apply {
+                isVisible = isSyncRunning
+                (actionView as ProgressBar).apply {
+                    indeterminateTintList = ColorStateList.valueOf(
+                        getColor(
+                            context,
+                            android.R.attr.textColorPrimary
+                        )
+                    )
+                    setPadding(
+                        0,
+                        resources.getDimensionPixelSize(R.dimen.text_margin),
+                        0,
+                        resources.getDimensionPixelSize(R.dimen.text_margin)
+                    )
+                }
+            }
+        menu.findItem(R.id.menu_status_draft)
+            ?.apply {
+                isChecked = statusesFilter.contains(ObservationRecord.Status.DRAFT)
+            }
+        menu.findItem(R.id.menu_status_to_sync)
+            ?.apply {
+                isChecked = statusesFilter.contains(ObservationRecord.Status.TO_SYNC)
+            }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.menu_sync -> {
+                observationRecordViewModel.synchronizeObservationRecords()
+                true
+            }
+
+            R.id.menu_status_draft -> {
+                item.isChecked = !item.isChecked
+
+                if (item.isChecked) statusesFilter.add(ObservationRecord.Status.DRAFT)
+                else statusesFilter.remove(ObservationRecord.Status.DRAFT)
+
+                loadObservationRecords()
+                true
+            }
+
+            R.id.menu_status_to_sync -> {
+                item.isChecked = !item.isChecked
+
+                if (item.isChecked) statusesFilter.add(ObservationRecord.Status.TO_SYNC)
+                else statusesFilter.remove(ObservationRecord.Status.TO_SYNC)
+
+                loadObservationRecords()
+                true
+            }
+
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+
+    private fun configureAppSettingsViewModel() {
+        appSettingsViewModel.appSettings.observe(viewLifecycleOwner) {
+            appSettings = it
+
+            if (it == null) {
+                fab?.hide()
+                adapter?.clear()
+
+                return@observe
+            }
+
+            fab?.show()
+            loadObservationRecords()
+        }
+    }
+
+    private fun configureDataSyncViewModel() {
+        with(dataSyncViewModel) {
+            observe(isSyncRunning) {
+                emptyTextView?.text =
+                    getString(
+                        if (it && dataSyncViewModel.lastSynchronizedDate.value?.second == null) R.string.home_first_sync
+                        else R.string.home_no_input
+                    )
+                if (it && dataSyncViewModel.lastSynchronizedDate.value?.second == null) {
+                    fab?.hide()
+                    adapter?.clear()
+                } else if (appSettings != null) {
+                    fab?.show()
+
+                    if (adapter?.items?.isEmpty() == true) {
+                        loadObservationRecords()
+                    }
+                }
+            }
+        }
+    }
+
+    private fun configureObservationRecordViewModel() {
+        with(observationRecordViewModel) {
+            observe(
+                observationRecords,
+                ::handleObservationRecords
+            )
+            observe(isSyncRunning) {
+                this@LastObservationRecordsFragment.isSyncRunning = it
+                activity?.invalidateOptionsMenu()
+            }
+            observe(hasObservationRecordsReadyToSynchronize) {
+                this@LastObservationRecordsFragment.hasObservationRecordsReadyToSynchronize = it
+                activity?.invalidateOptionsMenu()
+            }
+        }
+    }
+
+    private fun loadObservationRecords() {
+        if (statusesFilter.isEmpty()) {
+            statusesFilter.addAll(
+                listOf(
+                    ObservationRecord.Status.DRAFT,
+                    ObservationRecord.Status.TO_SYNC
+                )
+            )
+        }
+
+        observationRecordViewModel.getAll { input -> statusesFilter.any { input.status == it } }
+    }
+
+    private fun handleObservationRecords(observationRecords: List<ObservationRecord>) {
+        adapter?.setItems(observationRecords)
+    }
+
+    /**
+     * Callback used by [LastObservationRecordsFragment].
+     */
+    interface OnLastObservationRecordsFragmentListener {
+
+        /**
+         * Called when we want to start editing a given [ObservationRecord].
+         * If no [ObservationRecord] was given, creates a new one.
+         */
+        fun onStartEditObservationRecord(selectedObservationRecord: ObservationRecord? = null)
+    }
+
+    companion object {
+
+        /**
+         * Use this factory method to create a new instance of [LastObservationRecordsFragment].
+         *
+         * @return A new instance of [LastObservationRecordsFragment]
+         */
+        @JvmStatic
+        fun newInstance() = LastObservationRecordsFragment()
+    }
+}
\ No newline at end of file
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/home/InputRecyclerViewAdapter.kt b/occtax/src/main/java/fr/geonature/occtax/ui/home/ObservationRecordRecyclerViewAdapter.kt
similarity index 72%
rename from occtax/src/main/java/fr/geonature/occtax/ui/home/InputRecyclerViewAdapter.kt
rename to occtax/src/main/java/fr/geonature/occtax/ui/home/ObservationRecordRecyclerViewAdapter.kt
index 988a20fc..00dc331f 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/home/InputRecyclerViewAdapter.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/home/ObservationRecordRecyclerViewAdapter.kt
@@ -1,12 +1,11 @@
 package fr.geonature.occtax.ui.home
 
+import android.annotation.SuppressLint
 import android.text.format.DateFormat
-import android.util.TypedValue
-import android.view.LayoutInflater
 import android.view.View
 import android.widget.TextView
 import com.google.android.material.chip.Chip
-import com.google.android.material.chip.ChipGroup
+import com.google.android.material.progressindicator.CircularProgressIndicator
 import fr.geonature.commons.ui.adapter.AbstractListItemRecyclerViewAdapter
 import fr.geonature.commons.util.ThemeUtils.getColor
 import fr.geonature.occtax.R
@@ -14,11 +13,15 @@ import fr.geonature.occtax.features.record.domain.ObservationRecord
 
 /**
  * Default RecyclerView Adapter used by [HomeActivity].
+ * Default RecyclerView Adapter about [ObservationRecord].
  *
  * @author S. Grimault
+ *
+ * @see LastObservationRecordsFragment
  */
-class InputRecyclerViewAdapter(listener: OnListItemRecyclerViewAdapterListener<ObservationRecord>) :
+class ObservationRecordRecyclerViewAdapter(listener: OnListItemRecyclerViewAdapterListener<ObservationRecord>) :
     AbstractListItemRecyclerViewAdapter<ObservationRecord>(listener) {
+
     override fun getViewHolder(
         view: View,
         viewType: Int
@@ -55,9 +58,10 @@ class InputRecyclerViewAdapter(listener: OnListItemRecyclerViewAdapterListener<O
         AbstractListItemRecyclerViewAdapter<ObservationRecord>.AbstractViewHolder(itemView) {
         private val text1: TextView = itemView.findViewById(android.R.id.text1)
         private val text2: TextView = itemView.findViewById(android.R.id.text2)
-        private val chipGroup: ChipGroup = itemView.findViewById(R.id.chip_group_status)
+        private val chip: Chip = itemView.findViewById(R.id.chip_status)
 
         override fun onBind(item: ObservationRecord) {
+            itemView.isEnabled = item.status != ObservationRecord.Status.SYNC_SUCCESSFUL
             text1.text = itemView.context.getString(
                 R.string.home_input_created_at,
                 DateFormat.format(
@@ -74,22 +78,10 @@ class InputRecyclerViewAdapter(listener: OnListItemRecyclerViewAdapterListener<O
             buildChipStatus(item)
         }
 
+        @SuppressLint("DiscouragedApi")
         private fun buildChipStatus(item: ObservationRecord) {
-            chipGroup.removeAllViews()
-
-            with(
-                LayoutInflater.from(itemView.context)
-                    .inflate(
-                        R.layout.chip,
-                        chipGroup,
-                        false
-                    ) as Chip
-            ) {
-                chipMinHeight = TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP,
-                    24F,
-                    resources.displayMetrics
-                )
+            with(chip) {
+                isDuplicateParentStateEnabled = true
                 text = itemView.resources.getIdentifier(
                     "home_input_status_${item.status.name.lowercase()}",
                     "string",
@@ -108,13 +100,29 @@ class InputRecyclerViewAdapter(listener: OnListItemRecyclerViewAdapterListener<O
                     )
                         .takeIf { it > 0 } ?: R.color.input_status_draft
                 )
+                chipIcon =
+                    if (item.status == ObservationRecord.Status.SYNC_IN_PROGRESS) CircularProgressIndicator(context).apply {
+                        isIndeterminate = true
+                        indicatorSize = 44
+                        trackThickness = 4
+                        indicatorInset = 4
+                        setIndicatorColor(
+                            getColor(
+                                context,
+                                R.attr.colorOnPrimary
+                            )
+                        )
+                    }.indeterminateDrawable?.apply {
+                        start()
+                        chip.invalidate()
+                    } else null
+
                 setTextColor(
                     getColor(
                         context,
                         R.attr.colorOnPrimary
                     )
                 )
-                chipGroup.addView(this)
             }
         }
     }
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/InputPagerFragmentActivity.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/InputPagerFragmentActivity.kt
index 990c105b..fca4c55f 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/InputPagerFragmentActivity.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/InputPagerFragmentActivity.kt
@@ -15,6 +15,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import fr.geonature.commons.lifecycle.onError
 import fr.geonature.commons.util.KeyboardUtils.hideKeyboard
 import fr.geonature.commons.util.ThemeUtils
+import fr.geonature.compat.content.getParcelableExtraCompat
 import fr.geonature.maps.settings.MapSettings
 import fr.geonature.maps.ui.MapFragment
 import fr.geonature.maps.util.CheckPermissionLifecycleObserver
@@ -92,9 +93,9 @@ class InputPagerFragmentActivity : AbstractPagerFragmentActivity(),
             Manifest.permission.ACCESS_FINE_LOCATION
         )
 
-        appSettings = intent.getParcelableExtra(EXTRA_APP_SETTINGS)!!
+        appSettings = intent.getParcelableExtraCompat(EXTRA_APP_SETTINGS)!!
         observationRecord =
-            intent.getParcelableExtra(EXTRA_OBSERVATION_RECORD) ?: ObservationRecord()
+            intent.getParcelableExtraCompat(EXTRA_OBSERVATION_RECORD) ?: ObservationRecord()
 
         Logger.info { "loading observation record: ${observationRecord.id}" }
 
@@ -206,7 +207,7 @@ class InputPagerFragmentActivity : AbstractPagerFragmentActivity(),
     }
 
     override suspend fun onStoragePermissionsGranted() =
-        suspendCancellableCoroutine<Boolean> { continuation ->
+        suspendCancellableCoroutine { continuation ->
             lifecycleScope.launch {
                 continuation.resume(
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
@@ -219,7 +220,7 @@ class InputPagerFragmentActivity : AbstractPagerFragmentActivity(),
         }
 
     override suspend fun onLocationPermissionGranted() =
-        suspendCancellableCoroutine<Boolean> { continuation ->
+        suspendCancellableCoroutine { continuation ->
             lifecycleScope.launch {
                 continuation.resume(
                     locationPermissionLifecycleObserver?.invoke(this@InputPagerFragmentActivity)
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/CountingFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/CountingFragment.kt
index df702af6..a0d72d11 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/CountingFragment.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/CountingFragment.kt
@@ -21,6 +21,8 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 import fr.geonature.commons.ui.adapter.AbstractListItemRecyclerViewAdapter
+import fr.geonature.compat.content.getParcelableExtraCompat
+import fr.geonature.compat.os.getParcelableArrayCompat
 import fr.geonature.occtax.R
 import fr.geonature.occtax.features.record.domain.CountingRecord
 import fr.geonature.occtax.features.record.domain.TaxonRecord
@@ -51,7 +53,7 @@ class CountingFragment : AbstractInputFragment() {
                     return@registerForActivityResult
                 }
 
-                updateCountingMetadata(it.data?.getParcelableExtra(EditCountingMetadataActivity.EXTRA_COUNTING_RECORD))
+                updateCountingMetadata(it.data?.getParcelableExtraCompat(EditCountingMetadataActivity.EXTRA_COUNTING_RECORD))
             }
     }
 
@@ -207,18 +209,18 @@ class CountingFragment : AbstractInputFragment() {
         val context = context ?: return
         val taxonRecord = observationRecord?.taxa?.selectedTaxonRecord ?: return
 
-        editCountingResultLauncher.launch(EditCountingMetadataActivity.newIntent(
-            context,
-            taxonRecord,
-            countingRecord,
-            arguments?.getBoolean(
-                ARG_SAVE_DEFAULT_VALUES,
-                false
-            ) ?: false,
-            *(arguments?.getParcelableArray(ARG_PROPERTIES)
-                ?.map { it as PropertySettings }
-                ?.toTypedArray() ?: emptyArray())
-        ))
+        editCountingResultLauncher.launch(
+            EditCountingMetadataActivity.newIntent(
+                context,
+                taxonRecord,
+                countingRecord,
+                arguments?.getBoolean(
+                    ARG_SAVE_DEFAULT_VALUES,
+                    false
+                ) ?: false,
+                *(arguments?.getParcelableArrayCompat(ARG_PROPERTIES) ?: emptyArray())
+            )
+        )
     }
 
     private fun updateCountingMetadata(countingRecord: CountingRecord?) {
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/CountingRecyclerViewAdapter.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/CountingRecyclerViewAdapter.kt
index 5b35849a..3d238ff5 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/CountingRecyclerViewAdapter.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/CountingRecyclerViewAdapter.kt
@@ -1,5 +1,6 @@
 package fr.geonature.occtax.ui.input.counting
 
+import android.annotation.SuppressLint
 import android.text.Spanned
 import android.view.View
 import android.widget.TextView
@@ -128,6 +129,7 @@ class CountingRecyclerViewAdapter(listener: OnListItemRecyclerViewAdapterListene
                 HtmlCompat.FROM_HTML_MODE_LEGACY)
         }
 
+        @SuppressLint("DiscouragedApi")
         private fun getNomenclatureTypeLabel(mnemonic: String): String {
             val resourceId = itemView.resources.getIdentifier(
                 "nomenclature_${mnemonic.lowercase()}",
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/EditCountingMetadataActivity.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/EditCountingMetadataActivity.kt
index 78e0848a..1624faff 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/EditCountingMetadataActivity.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/EditCountingMetadataActivity.kt
@@ -8,6 +8,8 @@ import android.view.MenuItem
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import dagger.hilt.android.AndroidEntryPoint
+import fr.geonature.compat.content.getParcelableArrayExtraCompat
+import fr.geonature.compat.content.getParcelableExtraCompat
 import fr.geonature.occtax.R
 import fr.geonature.occtax.features.record.domain.CountingRecord
 import fr.geonature.occtax.features.record.domain.TaxonRecord
@@ -39,14 +41,14 @@ class EditCountingMetadataActivity : AppCompatActivity(),
             setDisplayHomeAsUpEnabled(true)
         }
 
-        val taxonRecord = intent.getParcelableExtra<TaxonRecord>(EXTRA_TAXON_RECORD) ?: run {
+        val taxonRecord = intent.getParcelableExtraCompat<TaxonRecord>(EXTRA_TAXON_RECORD) ?: run {
             // TODO: show a toast message about missing taxon record
             finish()
             return
         }
 
         countingRecord =
-            intent.getParcelableExtra(EXTRA_COUNTING_RECORD) ?: taxonRecord.counting.create()
+            intent.getParcelableExtraCompat(EXTRA_COUNTING_RECORD) ?: taxonRecord.counting.create()
 
         isNew = countingRecord.isEmpty()
         setTitle(if (countingRecord.isEmpty()) R.string.activity_counting_add_title else R.string.activity_counting_edit_title)
@@ -63,9 +65,8 @@ class EditCountingMetadataActivity : AppCompatActivity(),
                                 EXTRA_SAVE_DEFAULT_VALUES,
                                 false
                             ),
-                            *(intent.getParcelableArrayExtra(EXTRA_PROPERTIES)
-                                ?.map { it as PropertySettings }
-                                ?.toTypedArray() ?: emptyArray())
+                            *(intent.getParcelableArrayExtraCompat(EXTRA_PROPERTIES)
+                                ?: emptyArray())
                         )
                     )
                 }
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/EditCountingMetadataFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/EditCountingMetadataFragment.kt
index 5cf8dcf9..4dd6ec79 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/EditCountingMetadataFragment.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/EditCountingMetadataFragment.kt
@@ -26,6 +26,9 @@ import fr.geonature.commons.data.entity.Nomenclature
 import fr.geonature.commons.data.entity.Taxonomy
 import fr.geonature.commons.lifecycle.observe
 import fr.geonature.commons.util.KeyboardUtils.hideSoftKeyboard
+import fr.geonature.compat.content.getParcelableExtraCompat
+import fr.geonature.compat.os.getParcelableArrayCompat
+import fr.geonature.compat.os.getParcelableCompat
 import fr.geonature.occtax.R
 import fr.geonature.occtax.features.nomenclature.domain.EditableNomenclatureType
 import fr.geonature.occtax.features.nomenclature.presentation.EditableNomenclatureTypeAdapter
@@ -68,9 +71,9 @@ class EditCountingMetadataFragment : Fragment() {
         savedState = savedInstanceState ?: Bundle()
 
         arguments?.also {
-            taxonRecord = it.getParcelable(ARG_TAXON_RECORD)
+            taxonRecord = it.getParcelableCompat(ARG_TAXON_RECORD)
             countingRecord =
-                it.getParcelable(ARG_COUNTING_RECORD) ?: taxonRecord?.counting?.create()
+                it.getParcelableCompat(ARG_COUNTING_RECORD) ?: taxonRecord?.counting?.create()
         }
 
         with(nomenclatureViewModel) {
@@ -95,7 +98,7 @@ class EditCountingMetadataFragment : Fragment() {
                     return@registerForActivityResult
                 }
 
-                activityResult.data?.getParcelableExtra<CountingRecord>(MediaListActivity.EXTRA_COUNTING_RECORD)
+                activityResult.data?.getParcelableExtraCompat<CountingRecord>(MediaListActivity.EXTRA_COUNTING_RECORD)
                     ?.also { countingRecord ->
                         this.countingRecord = countingRecord
 
@@ -324,8 +327,7 @@ class EditCountingMetadataFragment : Fragment() {
 
         nomenclatureViewModel.getEditableNomenclatures(
             EditableNomenclatureType.Type.COUNTING,
-            (arguments?.getParcelableArray(ARG_PROPERTIES)
-                ?.map { it as PropertySettings }
+            (arguments?.getParcelableArrayCompat<PropertySettings>(ARG_PROPERTIES)
                 ?.toList() ?: emptyList()),
             taxonRecord.taxon.taxonomy
         )
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/MediaListActivity.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/MediaListActivity.kt
index 4e86f9c6..c7e357c5 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/MediaListActivity.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/MediaListActivity.kt
@@ -18,6 +18,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.snackbar.BaseTransientBottomBar
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
+import fr.geonature.compat.content.getParcelableExtraCompat
 import fr.geonature.occtax.R
 import fr.geonature.occtax.features.record.domain.CountingRecord
 import fr.geonature.occtax.features.record.domain.TaxonRecord
@@ -137,13 +138,13 @@ class MediaListActivity : AppCompatActivity() {
             }
         })
 
-        taxonRecord = intent.getParcelableExtra(EXTRA_TAXON_RECORD) ?: run {
+        taxonRecord = intent.getParcelableExtraCompat(EXTRA_TAXON_RECORD) ?: run {
             // TODO: show a toast message about missing taxon record
             finish()
             return
         }
 
-        countingRecord = intent.getParcelableExtra(EXTRA_COUNTING_RECORD) ?: run {
+        countingRecord = intent.getParcelableExtraCompat(EXTRA_COUNTING_RECORD) ?: run {
             // TODO: show a toast message about missing counting record
             finish()
             return
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/TakePhotoLifecycleObserver.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/TakePhotoLifecycleObserver.kt
index 3404f165..26ffe37d 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/TakePhotoLifecycleObserver.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/counting/TakePhotoLifecycleObserver.kt
@@ -68,7 +68,7 @@ class TakePhotoLifecycleObserver(
      * found
      */
     suspend operator fun invoke(from: ImagePicker, basePath: String) =
-        suspendCancellableCoroutine<File?> { continuation ->
+        suspendCancellableCoroutine { continuation ->
             Logger.info { "choose image from ${from.name.lowercase()}…" }
 
             chosenImageContinuation = continuation
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/informations/InformationFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/informations/InformationFragment.kt
index 6ab3d7f3..b354f214 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/informations/InformationFragment.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/informations/InformationFragment.kt
@@ -18,6 +18,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import fr.geonature.commons.data.entity.Nomenclature
 import fr.geonature.commons.data.entity.Taxonomy
 import fr.geonature.commons.lifecycle.observe
+import fr.geonature.compat.os.getParcelableArrayCompat
 import fr.geonature.occtax.R
 import fr.geonature.occtax.features.nomenclature.domain.EditableNomenclatureType
 import fr.geonature.occtax.features.nomenclature.presentation.EditableNomenclatureTypeAdapter
@@ -210,8 +211,7 @@ class InformationFragment : AbstractInputFragment() {
     override fun refreshView() {
         nomenclatureViewModel.getEditableNomenclatures(
             EditableNomenclatureType.Type.INFORMATION,
-            (arguments?.getParcelableArray(ARG_PROPERTIES)
-                ?.map { it as PropertySettings }
+            (arguments?.getParcelableArrayCompat<PropertySettings>(ARG_PROPERTIES)
                 ?.toList() ?: emptyList()),
             observationRecord?.taxa?.selectedTaxonRecord?.taxon?.taxonomy
         )
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/observers/ObserversAndDateInputFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/observers/ObserversAndDateInputFragment.kt
index 1e9d0748..80dbcc82 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/observers/ObserversAndDateInputFragment.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/observers/ObserversAndDateInputFragment.kt
@@ -27,6 +27,9 @@ import fr.geonature.commons.data.entity.Dataset
 import fr.geonature.commons.data.entity.InputObserver
 import fr.geonature.commons.data.helper.ProviderHelper.buildUri
 import fr.geonature.commons.util.afterTextChanged
+import fr.geonature.compat.content.getParcelableArrayExtraCompat
+import fr.geonature.compat.content.getParcelableExtraCompat
+import fr.geonature.compat.os.getParcelableCompat
 import fr.geonature.occtax.R
 import fr.geonature.occtax.features.nomenclature.presentation.PropertyValueModel
 import fr.geonature.occtax.features.record.domain.PropertyValue
@@ -197,9 +200,10 @@ class ObserversAndDateInputFragment : AbstractInputFragment() {
                 }
 
                 updateSelectedObservers(
-                    it.data?.getParcelableArrayListExtra(
+                    it.data?.getParcelableArrayExtraCompat<InputObserver>(
                         InputObserverListActivity.EXTRA_SELECTED_INPUT_OBSERVERS
-                    ) ?: ArrayList()
+                    )
+                        ?.toList() ?: emptyList()
                 )
             }
         datasetResultLauncher =
@@ -209,12 +213,11 @@ class ObserversAndDateInputFragment : AbstractInputFragment() {
                 }
 
                 updateSelectedDataset(
-                    it.data?.getParcelableExtra(
-                        DatasetListActivity.EXTRA_SELECTED_DATASET
-                    )
+                    it.data?.getParcelableExtraCompat(DatasetListActivity.EXTRA_SELECTED_DATASET)
                 )
             }
-        dateSettings = arguments?.getParcelable(ARG_DATE_SETTINGS) ?: InputDateSettings.DEFAULT
+        dateSettings =
+            arguments?.getParcelableCompat(ARG_DATE_SETTINGS) ?: InputDateSettings.DEFAULT
     }
 
     override fun onCreateView(
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/summary/InputTaxaSummaryFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/summary/InputTaxaSummaryFragment.kt
index a441a894..5811a117 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/summary/InputTaxaSummaryFragment.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/summary/InputTaxaSummaryFragment.kt
@@ -28,6 +28,9 @@ import com.google.android.material.chip.ChipGroup
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 import fr.geonature.commons.data.entity.Taxonomy
 import fr.geonature.commons.ui.adapter.AbstractListItemRecyclerViewAdapter
+import fr.geonature.compat.content.getParcelableArrayExtraCompat
+import fr.geonature.compat.os.getParcelableArrayCompat
+import fr.geonature.compat.os.getParcelableCompat
 import fr.geonature.occtax.R
 import fr.geonature.occtax.features.record.domain.TaxonRecord
 import fr.geonature.occtax.settings.InputDateSettings
@@ -69,7 +72,8 @@ class InputTaxaSummaryFragment : AbstractInputFragment() {
         super.onCreate(savedInstanceState)
 
         savedState = savedInstanceState ?: Bundle()
-        dateSettings = arguments?.getParcelable(ARG_DATE_SETTINGS) ?: InputDateSettings.DEFAULT
+        dateSettings =
+            arguments?.getParcelableCompat(ARG_DATE_SETTINGS) ?: InputDateSettings.DEFAULT
 
         val supportFragmentManager = activity?.supportFragmentManager ?: return
 
@@ -84,8 +88,8 @@ class InputTaxaSummaryFragment : AbstractInputFragment() {
                 }
 
                 val selectedFilters =
-                    activityResult.data?.getParcelableArrayExtra(TaxaFilterActivity.EXTRA_SELECTED_FILTERS)
-                        ?.map { it as Filter<*> }?.toTypedArray() ?: emptyArray()
+                    activityResult.data?.getParcelableArrayExtraCompat<Filter<*>>(TaxaFilterActivity.EXTRA_SELECTED_FILTERS)
+                        ?: emptyArray()
                 applyFilters(*selectedFilters)
             }
     }
@@ -119,13 +123,14 @@ class InputTaxaSummaryFragment : AbstractInputFragment() {
         emptyTextView = view.findViewById(android.R.id.empty)
         filterChipGroup = view.findViewById(R.id.chip_group_filter)
 
-        view.findViewById<ExtendedFloatingActionButton>(R.id.fab).apply {
-            setOnClickListener {
-                startEditTaxon = true
-                observationRecord?.taxa?.selectedTaxonRecord = null
-                listener.startEditTaxon()
+        view.findViewById<ExtendedFloatingActionButton>(R.id.fab)
+            .apply {
+                setOnClickListener {
+                    startEditTaxon = true
+                    observationRecord?.taxa?.selectedTaxonRecord = null
+                    listener.startEditTaxon()
+                }
             }
-        }
 
         adapter = InputTaxaSummaryRecyclerViewAdapter(object :
             AbstractListItemRecyclerViewAdapter.OnListItemRecyclerViewAdapterListener<TaxonRecord> {
@@ -329,7 +334,7 @@ class InputTaxaSummaryFragment : AbstractInputFragment() {
         if ((adapter?.itemCount ?: 0) > 0) adapter?.clear()
 
         val selectedFilters =
-            savedState.getParcelableArray(KEY_SELECTED_FILTERS)?.map { it as Filter<*> }
+            savedState.getParcelableArrayCompat<Filter<*>>(KEY_SELECTED_FILTERS)
                 ?.toList() ?: emptyList()
         val filterByTaxonomy =
             selectedFilters.find { filter -> filter.type == Filter.FilterType.TAXONOMY }?.value as Taxonomy?
@@ -384,11 +389,12 @@ class InputTaxaSummaryFragment : AbstractInputFragment() {
 
             // build kingdom taxonomy filter chip
             with(
-                LayoutInflater.from(context).inflate(
-                    R.layout.chip,
-                    filterChipGroup,
-                    false
-                ) as Chip
+                LayoutInflater.from(context)
+                    .inflate(
+                        R.layout.chip,
+                        filterChipGroup,
+                        false
+                    ) as Chip
             ) {
                 tag = Taxonomy(selectedTaxonomy.kingdom)
                 text = selectedTaxonomy.kingdom
@@ -407,11 +413,12 @@ class InputTaxaSummaryFragment : AbstractInputFragment() {
             // build group taxonomy filter chip
             if (selectedTaxonomy.group != Taxonomy.ANY) {
                 with(
-                    LayoutInflater.from(context).inflate(
-                        R.layout.chip,
-                        filterChipGroup,
-                        false
-                    ) as Chip
+                    LayoutInflater.from(context)
+                        .inflate(
+                            R.layout.chip,
+                            filterChipGroup,
+                            false
+                        ) as Chip
                 ) {
                     tag = selectedTaxonomy
                     text = selectedTaxonomy.group
@@ -431,7 +438,7 @@ class InputTaxaSummaryFragment : AbstractInputFragment() {
     }
 
     private fun getSelectedFilters(): List<Filter<*>> {
-        return savedState.getParcelableArray(KEY_SELECTED_FILTERS)?.map { it as Filter<*> }
+        return savedState.getParcelableArrayCompat<Filter<*>>(KEY_SELECTED_FILTERS)
             ?.toList() ?: emptyList()
     }
 
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/summary/InputTaxaSummaryRecyclerViewAdapter.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/summary/InputTaxaSummaryRecyclerViewAdapter.kt
index 7e67efeb..cc12ef26 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/summary/InputTaxaSummaryRecyclerViewAdapter.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/summary/InputTaxaSummaryRecyclerViewAdapter.kt
@@ -1,5 +1,6 @@
 package fr.geonature.occtax.ui.input.summary
 
+import android.annotation.SuppressLint
 import android.text.Spanned
 import android.text.SpannedString
 import android.view.View
@@ -97,6 +98,7 @@ class InputTaxaSummaryRecyclerViewAdapter(listener: OnListItemRecyclerViewAdapte
             )
         }
 
+        @SuppressLint("DiscouragedApi")
         private fun getNomenclatureTypeLabel(mnemonic: String): String {
             val resourceId = itemView.resources.getIdentifier(
                 "nomenclature_${mnemonic.lowercase()}",
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/Filter.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/Filter.kt
index 63479380..63cf8e4c 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/Filter.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/Filter.kt
@@ -6,7 +6,7 @@ import android.os.Parcelable
 /**
  * Describes a filter entry.
  *
- * @author [S. Grimault](mailto:sebastien.grimault@gmail.com)
+ * @author S. Grimault
  */
 open class Filter<T : Parcelable>(
     val type: FilterType,
@@ -40,10 +40,10 @@ open class Filter<T : Parcelable>(
     }
 
     override fun writeToParcel(
-        dest: Parcel?,
+        dest: Parcel,
         flags: Int
     ) {
-        dest?.also {
+        dest.also {
             it.writeInt(type.ordinal)
             it.writeParcelable(
                 value,
@@ -55,7 +55,7 @@ open class Filter<T : Parcelable>(
     /**
      * Describes a filter type.
      *
-     * @author [S. Grimault](mailto:sebastien.grimault@gmail.com)
+     * @author S. Grimault
      */
     enum class FilterType {
         AREA_OBSERVATION,
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/FilterAreaObservation.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/FilterAreaObservation.kt
index b6876e16..31e7b448 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/FilterAreaObservation.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/FilterAreaObservation.kt
@@ -6,7 +6,7 @@ import android.os.Parcelable
 /**
  * Area observation filter.
  *
- * @author [S. Grimault](mailto:sebastien.grimault@gmail.com)
+ * @author S. Grimault
  */
 class FilterAreaObservation(value: AreaObservation) : Filter<FilterAreaObservation.AreaObservation>(
     FilterType.AREA_OBSERVATION,
@@ -26,8 +26,8 @@ class FilterAreaObservation(value: AreaObservation) : Filter<FilterAreaObservati
             return 0
         }
 
-        override fun writeToParcel(dest: Parcel?, flags: Int) {
-            dest?.also {
+        override fun writeToParcel(dest: Parcel, flags: Int) {
+            dest.also {
                 it.writeString(type.name)
                 it.writeString(label)
                 it.writeString(short)
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/FilterRecyclerViewAdapter.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/FilterRecyclerViewAdapter.kt
index c159e8b5..a8e2540b 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/FilterRecyclerViewAdapter.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/FilterRecyclerViewAdapter.kt
@@ -183,9 +183,10 @@ class FilterRecyclerViewAdapter(val listener: FilterRecyclerViewAdapterListener<
 
         return filterTaxonomyRecyclerViewAdapter.items.indexOfFirst {
             it.value.kingdom == currentFilterTaxonomy.value.kingdom && it.value.group == Taxonomy.ANY
-        }.takeIf { it >= 0 }
+        }
+            .takeIf { it >= 0 }
             ?.plus(filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount + filterTitleTaxonomyRecyclerViewAdapter.itemCount)
-            ?: filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount + filterTitleTaxonomyRecyclerViewAdapter.itemCount - 1
+            ?: (filterAreaObservationRecyclerViewAdapter.itemCount + filterTitleAreaObservationRecyclerViewAdapter.itemCount + filterTitleTaxonomyRecyclerViewAdapter.itemCount - 1)
     }
 
     override fun onBindHeaderViewHolder(holder: HeaderViewHolder, headerPosition: Int) {
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/TaxaFilterFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/TaxaFilterFragment.kt
index b6ccbcc6..b5f73c14 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/TaxaFilterFragment.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/TaxaFilterFragment.kt
@@ -18,6 +18,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import fr.geonature.commons.data.ContentProviderAuthority
 import fr.geonature.commons.data.entity.Taxonomy
 import fr.geonature.commons.data.helper.ProviderHelper.buildUri
+import fr.geonature.compat.os.getParcelableArrayCompat
 import fr.geonature.occtax.R
 import fr.geonature.occtax.settings.AppSettings
 import org.tinylog.kotlin.Logger
@@ -77,9 +78,10 @@ class TaxaFilterFragment : Fragment() {
                     val filterTaxonomyList = mutableListOf<FilterTaxonomy>()
 
                     while (!data.isAfterLast) {
-                        Taxonomy.fromCursor(data)?.also {
-                            filterTaxonomyList.add(FilterTaxonomy(it))
-                        }
+                        Taxonomy.fromCursor(data)
+                            ?.also {
+                                filterTaxonomyList.add(FilterTaxonomy(it))
+                            }
 
                         data.moveToNext()
                     }
@@ -121,9 +123,10 @@ class TaxaFilterFragment : Fragment() {
             }
         })
 
-        arguments?.getParcelableArray(ARG_FILTERS)?.map { it as Filter<*> }?.toTypedArray()?.also {
-            adapter?.setSelectedFilters(*it)
-        }
+        arguments?.getParcelableArrayCompat<Filter<*>>(ARG_FILTERS)
+            ?.also {
+                adapter?.setSelectedFilters(*it)
+            }
 
         with(recyclerView) {
             val layoutManager = LinearLayoutManager(context)
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/TaxaFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/TaxaFragment.kt
index 22951338..ea3036f8 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/TaxaFragment.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/input/taxa/TaxaFragment.kt
@@ -1,5 +1,6 @@
 package fr.geonature.occtax.ui.input.taxa
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.content.res.ColorStateList
@@ -35,6 +36,8 @@ import fr.geonature.commons.data.entity.TaxonWithArea
 import fr.geonature.commons.data.entity.Taxonomy
 import fr.geonature.commons.data.helper.ProviderHelper.buildUri
 import fr.geonature.commons.util.ThemeUtils
+import fr.geonature.compat.content.getParcelableArrayExtraCompat
+import fr.geonature.compat.os.getParcelableArrayCompat
 import fr.geonature.occtax.R
 import fr.geonature.occtax.settings.AppSettings
 import fr.geonature.occtax.ui.input.AbstractInputFragment
@@ -69,7 +72,7 @@ class TaxaFragment : AbstractInputFragment() {
         ): Loader<Cursor> {
 
             val selectedFilters =
-                args?.getParcelableArray(KEY_SELECTED_FILTERS)?.map { it as Filter<*> }
+                args?.getParcelableArrayCompat<Filter<*>>(KEY_SELECTED_FILTERS)
                     ?.toList() ?: emptyList()
 
             return when (id) {
@@ -96,7 +99,8 @@ class TaxaFragment : AbstractInputFragment() {
                                                 FilterAreaObservation.AreaObservationType.LESS_THAN_DURATION -> "grey"
                                                 else -> "none"
                                             }
-                                        }.toList()
+                                        }
+                                        .toList()
                                 val filterByTaxonomy =
                                     selectedFilters.find { filter -> filter.type == Filter.FilterType.TAXONOMY }?.value as Taxonomy?
 
@@ -107,7 +111,8 @@ class TaxaFragment : AbstractInputFragment() {
                                 if (filterByTaxonomy != null) {
                                     it.byTaxonomy(filterByTaxonomy)
                                 }
-                            }.build()
+                            }
+                            .build()
 
                     CursorLoader(
                         requireContext(),
@@ -118,8 +123,11 @@ class TaxaFragment : AbstractInputFragment() {
                         ),
                         null,
                         taxonFilter.first,
-                        taxonFilter.second.map { it.toString() }.toTypedArray(),
-                        TaxonWithArea.OrderBy().byName(args?.getString(KEY_FILTER_BY_NAME)).build()
+                        taxonFilter.second.map { it.toString() }
+                            .toTypedArray(),
+                        TaxonWithArea.OrderBy()
+                            .byName(args?.getString(KEY_FILTER_BY_NAME))
+                            .build()
                     )
                 }
                 LOADER_TAXON -> {
@@ -133,7 +141,8 @@ class TaxaFragment : AbstractInputFragment() {
                         buildUri(
                             authority,
                             Taxon.TABLE_NAME,
-                            args?.getLong(KEY_SELECTED_TAXON_ID).toString(),
+                            args?.getLong(KEY_SELECTED_TAXON_ID)
+                                .toString(),
                             if (selectedFeatureId == null) "" else "area/$selectedFeatureId"
                         ),
                         null,
@@ -197,8 +206,8 @@ class TaxaFragment : AbstractInputFragment() {
                 }
 
                 val selectedFilters =
-                    activityResult.data?.getParcelableArrayExtra(TaxaFilterActivity.EXTRA_SELECTED_FILTERS)
-                        ?.map { it as Filter<*> }?.toTypedArray() ?: emptyArray()
+                    activityResult.data?.getParcelableArrayExtraCompat<Filter<*>>(TaxaFilterActivity.EXTRA_SELECTED_FILTERS)
+                        ?: emptyArray()
                 applyFilters(*selectedFilters)
             }
     }
@@ -355,7 +364,8 @@ class TaxaFragment : AbstractInputFragment() {
                 taxaFilterResultLauncher.launch(
                     TaxaFilterActivity.newIntent(
                         context,
-                        !savedState.getString(KEY_SELECTED_FEATURE_ID).isNullOrEmpty(),
+                        !savedState.getString(KEY_SELECTED_FEATURE_ID)
+                            .isNullOrEmpty(),
                         arguments?.getInt(
                             ARG_AREA_OBSERVATION_DURATION,
                             AppSettings.DEFAULT_AREA_OBSERVATION_DURATION
@@ -455,6 +465,7 @@ class TaxaFragment : AbstractInputFragment() {
         loadTaxa()
     }
 
+    @SuppressLint("DiscouragedApi")
     private fun filterByAreaObservation(vararg areaObservation: FilterAreaObservation.AreaObservation) {
         val filterChipGroup = filterChipGroup ?: return
         val context = context ?: return
@@ -486,14 +497,16 @@ class TaxaFragment : AbstractInputFragment() {
 
         filterChipGroup.visibility = View.VISIBLE
 
-        areaObservation.toList().sortedBy { it.type }
+        areaObservation.toList()
+            .sortedBy { it.type }
             .forEachIndexed { index, areaObservationToAdd ->
                 with(
-                    LayoutInflater.from(context).inflate(
-                        R.layout.chip,
-                        filterChipGroup,
-                        false
-                    ) as Chip
+                    LayoutInflater.from(context)
+                        .inflate(
+                            R.layout.chip,
+                            filterChipGroup,
+                            false
+                        ) as Chip
                 ) {
                     tag = areaObservationToAdd
                     text = areaObservationToAdd.short
@@ -502,7 +515,8 @@ class TaxaFragment : AbstractInputFragment() {
                         "area_observation_${areaObservationToAdd.type.name.lowercase(Locale.ROOT)}",
                         "color",
                         context.packageName
-                    ).takeIf { it > 0 } ?: R.color.accent)
+                    )
+                        .takeIf { it > 0 } ?: R.color.accent)
                     setTextColor(
                         ThemeUtils.getColor(
                             context,
@@ -558,11 +572,12 @@ class TaxaFragment : AbstractInputFragment() {
 
             // build kingdom taxonomy filter chip
             with(
-                LayoutInflater.from(context).inflate(
-                    R.layout.chip,
-                    filterChipGroup,
-                    false
-                ) as Chip
+                LayoutInflater.from(context)
+                    .inflate(
+                        R.layout.chip,
+                        filterChipGroup,
+                        false
+                    ) as Chip
             ) {
                 tag = Taxonomy(selectedTaxonomy.kingdom)
                 text = selectedTaxonomy.kingdom
@@ -581,11 +596,12 @@ class TaxaFragment : AbstractInputFragment() {
             // build group taxonomy filter chip
             if (selectedTaxonomy.group != Taxonomy.ANY) {
                 with(
-                    LayoutInflater.from(context).inflate(
-                        R.layout.chip,
-                        filterChipGroup,
-                        false
-                    ) as Chip
+                    LayoutInflater.from(context)
+                        .inflate(
+                            R.layout.chip,
+                            filterChipGroup,
+                            false
+                        ) as Chip
                 ) {
                     tag = selectedTaxonomy
                     text = selectedTaxonomy.group
@@ -605,7 +621,7 @@ class TaxaFragment : AbstractInputFragment() {
     }
 
     private fun getSelectedFilters(): List<Filter<*>> {
-        return savedState.getParcelableArray(KEY_SELECTED_FILTERS)?.map { it as Filter<*> }
+        return savedState.getParcelableArrayCompat<Filter<*>>(KEY_SELECTED_FILTERS)
             ?.toList() ?: emptyList()
     }
 
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/observers/InputObserverListActivity.kt b/occtax/src/main/java/fr/geonature/occtax/ui/observers/InputObserverListActivity.kt
index e6e8a2e6..e916c5f5 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/observers/InputObserverListActivity.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/observers/InputObserverListActivity.kt
@@ -8,6 +8,7 @@ import android.widget.ListView
 import androidx.appcompat.app.AppCompatActivity
 import dagger.hilt.android.AndroidEntryPoint
 import fr.geonature.commons.data.entity.InputObserver
+import fr.geonature.compat.content.getParcelableArrayExtraCompat
 import fr.geonature.occtax.R
 
 /**
@@ -38,7 +39,8 @@ class InputObserverListActivity : AppCompatActivity(),
                         EXTRA_CHOICE_MODE,
                         ListView.CHOICE_MODE_SINGLE
                     ),
-                    intent.getParcelableArrayListExtra(EXTRA_SELECTED_INPUT_OBSERVERS)
+                    intent.getParcelableArrayExtraCompat<InputObserver>(EXTRA_SELECTED_INPUT_OBSERVERS)
+                        ?.toList()
                         ?: emptyList()
                 )
             )
@@ -47,9 +49,9 @@ class InputObserverListActivity : AppCompatActivity(),
 
     override fun onSelectedInputObservers(inputObservers: List<InputObserver>) {
         val intent = Intent().apply {
-            putParcelableArrayListExtra(
+            putExtra(
                 EXTRA_SELECTED_INPUT_OBSERVERS,
-                ArrayList(inputObservers)
+                inputObservers.toTypedArray()
             )
         }
 
@@ -79,9 +81,9 @@ class InputObserverListActivity : AppCompatActivity(),
                     EXTRA_CHOICE_MODE,
                     choiceMode
                 )
-                putParcelableArrayListExtra(
+                putExtra(
                     EXTRA_SELECTED_INPUT_OBSERVERS,
-                    ArrayList(selectedObservers)
+                    selectedObservers.toTypedArray()
                 )
             }
         }
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/observers/InputObserverListFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/observers/InputObserverListFragment.kt
index 0ce1c839..eeeede90 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/observers/InputObserverListFragment.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/observers/InputObserverListFragment.kt
@@ -25,6 +25,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import fr.geonature.commons.data.ContentProviderAuthority
 import fr.geonature.commons.data.entity.InputObserver
 import fr.geonature.commons.data.helper.ProviderHelper.buildUri
+import fr.geonature.compat.os.getParcelableArrayCompat
 import fr.geonature.occtax.R
 import fr.geonature.occtax.R.layout.fast_scroll_recycler_view
 import javax.inject.Inject
@@ -54,7 +55,9 @@ class InputObserverListFragment : Fragment() {
             return when (id) {
                 LOADER_OBSERVERS -> {
                     val observersFilter =
-                        InputObserver.Filter().byName(args?.getString(KEY_FILTER)).build()
+                        InputObserver.Filter()
+                            .byName(args?.getString(KEY_FILTER))
+                            .build()
 
                     CursorLoader(
                         requireContext(),
@@ -64,8 +67,11 @@ class InputObserverListFragment : Fragment() {
                         ),
                         null,
                         observersFilter.first,
-                        observersFilter.second.map { it.toString() }.toTypedArray(),
-                        InputObserver.OrderBy().byName(args?.getString(KEY_FILTER)).build()
+                        observersFilter.second.map { it.toString() }
+                            .toTypedArray(),
+                        InputObserver.OrderBy()
+                            .byName(args?.getString(KEY_FILTER))
+                            .build()
                     )
                 }
 
@@ -123,7 +129,7 @@ class InputObserverListFragment : Fragment() {
                     false
                 )
             }
-            
+
             return !searchCriterion.isNullOrEmpty()
         }
 
@@ -179,8 +185,9 @@ class InputObserverListFragment : Fragment() {
                     ?: ListView.CHOICE_MODE_SINGLE
             )
             adapter?.setSelectedInputObservers(
-                arguments?.getParcelableArrayList(ARG_SELECTED_INPUT_OBSERVERS)
-                    ?: listOf()
+                arguments?.getParcelableArrayCompat<InputObserver>(ARG_SELECTED_INPUT_OBSERVERS)
+                    ?.toList()
+                    ?: emptyList()
             )
                 .also { updateActionMode(adapter?.getSelectedInputObservers() ?: listOf()) }
 
@@ -353,9 +360,9 @@ class InputObserverListFragment : Fragment() {
                     ARG_CHOICE_MODE,
                     choiceMode
                 )
-                putParcelableArrayList(
+                putParcelableArray(
                     ARG_SELECTED_INPUT_OBSERVERS,
-                    ArrayList(selectedObservers)
+                    selectedObservers.toTypedArray()
                 )
             }
         }
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/observers/InputObserverRecyclerViewAdapter.kt b/occtax/src/main/java/fr/geonature/occtax/ui/observers/InputObserverRecyclerViewAdapter.kt
index d29e36ac..9a3e329a 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/observers/InputObserverRecyclerViewAdapter.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/observers/InputObserverRecyclerViewAdapter.kt
@@ -24,7 +24,7 @@ class InputObserverRecyclerViewAdapter(private val listener: OnInputObserverRecy
     FastScroller.SectionIndexer {
     private var cursor: Cursor? = null
     private var choiceMode: Int = ListView.CHOICE_MODE_SINGLE
-    private val selectedInputObservers: MutableList<InputObserver> = ArrayList()
+    private val selectedInputObservers: MutableList<InputObserver> = mutableListOf()
     private val onClickListener: View.OnClickListener
 
     init {
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/settings/PreferencesActivity.kt b/occtax/src/main/java/fr/geonature/occtax/ui/settings/PreferencesActivity.kt
index 56eba5fd..bfb41536 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/settings/PreferencesActivity.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/settings/PreferencesActivity.kt
@@ -8,13 +8,10 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import dagger.hilt.android.AndroidEntryPoint
 import fr.geonature.commons.fp.orNull
+import fr.geonature.compat.content.getParcelableExtraCompat
 import fr.geonature.datasync.api.IGeoNatureAPIClient
 import fr.geonature.datasync.settings.DataSyncSettingsViewModel
-import fr.geonature.occtax.BuildConfig
-import fr.geonature.occtax.R
 import fr.geonature.occtax.settings.AppSettings
-import java.text.DateFormat
-import java.util.Date
 
 /**
  * Global settings.
@@ -24,8 +21,7 @@ import java.util.Date
  * @author S. Grimault
  */
 @AndroidEntryPoint
-class PreferencesActivity : AppCompatActivity(),
-    PreferencesFragment.OnPreferencesFragmentListener {
+class PreferencesActivity : AppCompatActivity() {
 
     private val dataSyncSettingsViewModel: DataSyncSettingsViewModel by viewModels()
 
@@ -36,7 +32,7 @@ class PreferencesActivity : AppCompatActivity(),
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-        val appSettings: AppSettings? = intent.getParcelableExtra(EXTRA_APP_SETTINGS)
+        val appSettings: AppSettings? = intent.getParcelableExtraCompat(EXTRA_APP_SETTINGS)
 
         serverUrls = dataSyncSettingsViewModel
             .getServerBaseUrls()
@@ -44,13 +40,15 @@ class PreferencesActivity : AppCompatActivity(),
 
         // Display the fragment as the main content.
         supportFragmentManager.beginTransaction()
-            .replace(
-                android.R.id.content,
-                PreferencesFragment.newInstance(
-                    serverUrls,
-                    appSettings?.mapSettings
+            .apply {
+                replace(
+                    android.R.id.content,
+                    PreferencesFragment.newInstance(
+                        serverUrls,
+                        appSettings?.mapSettings
+                    )
                 )
-            )
+            }
             .commit()
     }
 
@@ -86,16 +84,6 @@ class PreferencesActivity : AppCompatActivity(),
         }
     }
 
-    override fun getAppVersion(): String {
-        return getString(
-            R.string.app_version,
-            BuildConfig.VERSION_NAME,
-            BuildConfig.VERSION_CODE,
-            DateFormat.getDateTimeInstance()
-                .format(Date(BuildConfig.BUILD_DATE.toLong()))
-        )
-    }
-
     companion object {
 
         private const val EXTRA_APP_SETTINGS = "extra_app_settings"
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/settings/PreferencesFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/settings/PreferencesFragment.kt
index a2870fe7..30b76404 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/settings/PreferencesFragment.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/settings/PreferencesFragment.kt
@@ -1,18 +1,15 @@
 package fr.geonature.occtax.ui.settings
 
 import android.app.Activity
-import android.content.Context
 import android.content.Intent
 import android.database.Cursor
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.os.Environment
 import android.provider.Settings
 import android.widget.ListView
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.annotation.RequiresApi
 import androidx.core.os.bundleOf
 import androidx.loader.app.LoaderManager
 import androidx.loader.content.CursorLoader
@@ -26,6 +23,9 @@ import fr.geonature.commons.data.ContentProviderAuthority
 import fr.geonature.commons.data.entity.Dataset
 import fr.geonature.commons.data.entity.InputObserver
 import fr.geonature.commons.data.helper.ProviderHelper.buildUri
+import fr.geonature.compat.content.getParcelableArrayExtraCompat
+import fr.geonature.compat.content.getParcelableExtraCompat
+import fr.geonature.compat.os.getParcelableCompat
 import fr.geonature.datasync.api.IGeoNatureAPIClient
 import fr.geonature.datasync.features.settings.presentation.ConfigureServerSettingsDialogFragment
 import fr.geonature.maps.settings.MapSettings
@@ -54,8 +54,6 @@ class PreferencesFragment : PreferenceFragmentCompat() {
     private lateinit var datasetResultLauncher: ActivityResultLauncher<Intent>
     private lateinit var observerResultLauncher: ActivityResultLauncher<Intent>
 
-    private var listener: OnPreferencesFragmentListener? = null
-
     private val loaderCallbacks = object : LoaderManager.LoaderCallbacks<Cursor> {
         override fun onCreateLoader(
             id: Int,
@@ -69,7 +67,8 @@ class PreferencesFragment : PreferenceFragmentCompat() {
                         authority,
                         Dataset.TABLE_NAME,
                         "occtax",
-                        args!!.getLong(KEY_SELECTED_DATASET).toString()
+                        args!!.getLong(KEY_SELECTED_DATASET)
+                            .toString()
                     ),
                     null,
                     null,
@@ -81,7 +80,8 @@ class PreferencesFragment : PreferenceFragmentCompat() {
                     buildUri(
                         authority,
                         InputObserver.TABLE_NAME,
-                        args?.getLongArray(KEY_SELECTED_OBSERVER_IDS)?.joinToString(",")
+                        args?.getLongArray(KEY_SELECTED_OBSERVER_IDS)
+                            ?.joinToString(",")
                             ?: ""
                     ),
                     null,
@@ -108,9 +108,10 @@ class PreferencesFragment : PreferenceFragmentCompat() {
                         mutableListOf<InputObserver>().let {
                             if (cursor.moveToFirst()) {
                                 while (!cursor.isAfterLast) {
-                                    InputObserver.fromCursor(cursor)?.run {
-                                        it.add(this)
-                                    }
+                                    InputObserver.fromCursor(cursor)
+                                        ?.run {
+                                            it.add(this)
+                                        }
 
                                     cursor.moveToNext()
                                 }
@@ -140,7 +141,7 @@ class PreferencesFragment : PreferenceFragmentCompat() {
                 }
 
                 updateDefaultDatasetPreference(
-                    it.data?.getParcelableExtra(
+                    it.data?.getParcelableExtraCompat(
                         DatasetListActivity.EXTRA_SELECTED_DATASET
                     )
                 )
@@ -152,8 +153,9 @@ class PreferencesFragment : PreferenceFragmentCompat() {
                 }
 
                 updateDefaultObserversPreference(
-                    it.data?.getParcelableArrayListExtra(InputObserverListActivity.EXTRA_SELECTED_INPUT_OBSERVERS)
-                        ?: ArrayList()
+                    it.data?.getParcelableArrayExtraCompat<InputObserver>(InputObserverListActivity.EXTRA_SELECTED_INPUT_OBSERVERS)
+                        ?.toList()
+                        ?: emptyList()
                 )
             }
 
@@ -161,17 +163,11 @@ class PreferencesFragment : PreferenceFragmentCompat() {
         loadDefaultObserver()
         configurePermissionsPreference()
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            configureNotificationsPreferences()
-        }
+        configureNotificationsPreferences()
 
-        setServerUrlsPreferences(arguments?.getParcelable(ARG_SERVER_URLS))
-        setMapSettingsPreferences(arguments?.getParcelable(ARG_MAP_SETTINGS))
+        setServerUrlsPreferences(arguments?.getParcelableCompat(ARG_SERVER_URLS))
+        setMapSettingsPreferences(arguments?.getParcelableCompat(ARG_MAP_SETTINGS))
         setMountPointsPreferences(preferenceScreen)
-
-        (preferenceScreen.findPreference(getString(R.string.preference_category_about_app_version_key)) as Preference?)?.also {
-            it.summary = listener?.getAppVersion()
-        }
     }
 
     override fun onCreatePreferences(
@@ -183,29 +179,8 @@ class PreferencesFragment : PreferenceFragmentCompat() {
         addPreferencesFromResource(R.xml.preferences_observers)
         addPreferencesFromResource(R.xml.map_preferences)
         addPreferencesFromResource(R.xml.preferences_permissions)
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            addPreferencesFromResource(R.xml.preferences_notifications)
-        }
-
+        addPreferencesFromResource(R.xml.preferences_notifications)
         addPreferencesFromResource(R.xml.preferences_storage)
-        addPreferencesFromResource(R.xml.preferences_about)
-    }
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-
-        if (context is OnPreferencesFragmentListener) {
-            listener = context
-        } else {
-            throw RuntimeException("$context must implement OnPreferencesFragmentListener")
-        }
-    }
-
-    override fun onDetach() {
-        super.onDetach()
-
-        listener = null
     }
 
     private fun loadDefaultDataset() {
@@ -257,7 +232,8 @@ class PreferencesFragment : PreferenceFragmentCompat() {
                 bundleOf(
                     Pair(
                         KEY_SELECTED_OBSERVER_IDS,
-                        defaultObserversId.toTypedArray().toLongArray()
+                        defaultObserversId.toTypedArray()
+                            .toLongArray()
                     )
                 ),
                 loaderCallbacks
@@ -280,34 +256,37 @@ class PreferencesFragment : PreferenceFragmentCompat() {
             val supportFragmentManager =
                 activity?.supportFragmentManager ?: return@OnPreferenceClickListener false
 
-            ConfigureServerSettingsDialogFragment.newInstance(serverUrl).apply {
-                setOnConfigureServerSettingsDialogFragmentListener(object :
-                    ConfigureServerSettingsDialogFragment.OnConfigureServerSettingsDialogFragmentListener {
-                    override fun onChanged(url: String) {
-                        PreferenceManager.getDefaultSharedPreferences(serverSettingsPreference.context)
-                            .edit().also {
-                                it.putString(
-                                    getString(R.string.preference_category_server_geonature_url_key),
-                                    url
-                                )
-
-                                serverSettingsPreference.summary = url
-
-                                it.apply()
-                            }
-                    }
-                })
-                show(
-                    supportFragmentManager,
-                    SERVER_SETTINGS_DIALOG_FRAGMENT
-                )
-            }
+            ConfigureServerSettingsDialogFragment.newInstance(serverUrl)
+                .apply {
+                    setOnConfigureServerSettingsDialogFragmentListener(object :
+                        ConfigureServerSettingsDialogFragment.OnConfigureServerSettingsDialogFragmentListener {
+                        override fun onChanged(url: String) {
+                            PreferenceManager.getDefaultSharedPreferences(serverSettingsPreference.context)
+                                .edit()
+                                .also {
+                                    it.putString(
+                                        getString(R.string.preference_category_server_geonature_url_key),
+                                        url
+                                    )
+
+                                    serverSettingsPreference.summary = url
+
+                                    it.apply()
+                                }
+                        }
+                    })
+                    show(
+                        supportFragmentManager,
+                        SERVER_SETTINGS_DIALOG_FRAGMENT
+                    )
+                }
 
             true
         }
 
         PreferenceManager.getDefaultSharedPreferences(serverSettingsPreference.context)
-            .edit().also {
+            .edit()
+            .also {
                 if (serverUrl.isNullOrBlank()) {
                     it.remove(getString(R.string.preference_category_server_geonature_url_key))
                     serverSettingsPreference.setSummary(R.string.preference_category_server_geonature_url_not_set)
@@ -328,7 +307,9 @@ class PreferencesFragment : PreferenceFragmentCompat() {
 
         MapSettingsPreferencesUtils.setDefaultPreferences(
             context,
-            MapSettings.Builder.newInstance().from(mapSettings).build(),
+            MapSettings.Builder.newInstance()
+                .from(mapSettings)
+                .build(),
             preferenceScreen
         )
     }
@@ -421,7 +402,8 @@ class PreferencesFragment : PreferenceFragmentCompat() {
         } else {
             editor.putStringSet(
                 getString(R.string.preference_category_observers_default_key),
-                defaultObservers.map { it.id.toString() }.toSet()
+                defaultObservers.map { it.id.toString() }
+                    .toSet()
             )
             defaultObserverPreference.summary =
                 if (defaultObservers.size < 3) defaultObservers.joinToString(", ") {
@@ -456,7 +438,6 @@ class PreferencesFragment : PreferenceFragmentCompat() {
             }
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
     private fun configureNotificationsPreferences() {
         preferenceScreen
             .findPreference<Preference>(getString(R.string.preference_category_notifications_configure_key))
@@ -473,13 +454,6 @@ class PreferencesFragment : PreferenceFragmentCompat() {
             }
     }
 
-    /**
-     * Callback used by [PreferencesFragment].
-     */
-    interface OnPreferencesFragmentListener {
-        fun getAppVersion(): String
-    }
-
     companion object {
 
         private const val ARG_SERVER_URLS = "server_urls"
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/shared/dialog/InputDateDialogFragment.kt b/occtax/src/main/java/fr/geonature/occtax/ui/shared/dialog/InputDateDialogFragment.kt
index 2c4c686e..9a83e560 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/shared/dialog/InputDateDialogFragment.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/shared/dialog/InputDateDialogFragment.kt
@@ -8,6 +8,8 @@ import android.widget.Button
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentManager
+import fr.geonature.compat.os.getParcelableCompat
+import fr.geonature.compat.os.getSerializableCompat
 import fr.geonature.occtax.R
 import fr.geonature.occtax.settings.InputDateSettings
 import fr.geonature.occtax.ui.shared.view.InputDateView
@@ -38,13 +40,13 @@ class InputDateDialogFragment : DialogFragment() {
         )
 
         // restore the previous state if any
-        dateSettings = (savedInstanceState?.getParcelable(KEY_DATE_SETTINGS)
-            ?: arguments?.getParcelable(KEY_DATE_SETTINGS)
+        dateSettings = (savedInstanceState?.getParcelableCompat(KEY_DATE_SETTINGS)
+            ?: arguments?.getParcelableCompat(KEY_DATE_SETTINGS)
             ?: InputDateSettings(endDateSettings = InputDateSettings.DateSettings.DATE))
-        startDate = (savedInstanceState?.getSerializable(KEY_DATE_START) as Date?)
-            ?: (arguments?.getSerializable(KEY_DATE_START) as Date?) ?: Date()
-        endDate = (savedInstanceState?.getSerializable(KEY_DATE_END) as Date?)
-            ?: (arguments?.getSerializable(KEY_DATE_END) as Date?) ?: startDate
+        startDate = savedInstanceState?.getSerializableCompat(KEY_DATE_START)
+            ?: arguments?.getSerializableCompat(KEY_DATE_START) ?: Date()
+        endDate = savedInstanceState?.getSerializableCompat(KEY_DATE_END)
+            ?: arguments?.getSerializableCompat(KEY_DATE_END) ?: startDate
 
         view.findViewById<InputDateView>(R.id.input_date)?.also {
             it.setInputDateSettings(dateSettings)
diff --git a/occtax/src/main/java/fr/geonature/occtax/ui/shared/view/ActionView.kt b/occtax/src/main/java/fr/geonature/occtax/ui/shared/view/ActionView.kt
index a2ae664b..39d3a7c2 100644
--- a/occtax/src/main/java/fr/geonature/occtax/ui/shared/view/ActionView.kt
+++ b/occtax/src/main/java/fr/geonature/occtax/ui/shared/view/ActionView.kt
@@ -76,9 +76,10 @@ class ActionView : ConstraintLayout {
                 params
             )
         } else {
-            contentView?.children?.asSequence()?.filter { it.id != emptyTextView.id }?.forEach {
-                contentView?.removeView(it)
-            }
+            contentView?.children?.filter { it.id != emptyTextView.id }
+                ?.forEach {
+                    contentView?.removeView(it)
+                }
             contentView?.addView(
                 child,
                 index,
@@ -89,7 +90,7 @@ class ActionView : ConstraintLayout {
     }
 
     fun getContentView(): View? {
-        return contentView?.children?.asSequence()?.firstOrNull { it.id != emptyTextView.id }
+        return contentView?.children?.firstOrNull { it.id != emptyTextView.id }
     }
 
     fun setListener(listener: OnActionViewListener) {
@@ -134,7 +135,7 @@ class ActionView : ConstraintLayout {
         contentViewVisibility = visibility
         actionButton.setText(if (visibility == View.VISIBLE) actionText else actionEmptyText.takeIf { it > 0 }
             ?: actionText)
-        contentView?.children?.asSequence()?.forEach {
+        contentView?.children?.forEach {
             if (it.id == emptyTextView.id) it.visibility =
                 if (visibility == View.VISIBLE) View.GONE else View.VISIBLE
             else it.visibility = if (visibility == View.VISIBLE) View.VISIBLE else View.GONE
@@ -165,9 +166,10 @@ class ActionView : ConstraintLayout {
             0
         )
 
-        ta.getString(R.styleable.ActionView_title)?.also {
-            setTitle(it)
-        }
+        ta.getString(R.styleable.ActionView_title)
+            ?.also {
+                setTitle(it)
+            }
         setTitle(
             ta.getResourceId(
                 R.styleable.ActionView_title,
diff --git a/occtax/src/main/res/anim/fade_in.xml b/occtax/src/main/res/anim/fade_in.xml
new file mode 100644
index 00000000..1b2f3163
--- /dev/null
+++ b/occtax/src/main/res/anim/fade_in.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@android:integer/config_shortAnimTime"
+    android:fromAlpha="0.0"
+    android:interpolator="@android:interpolator/decelerate_quad"
+    android:toAlpha="1.0" />
\ No newline at end of file
diff --git a/occtax/src/main/res/anim/fade_out.xml b/occtax/src/main/res/anim/fade_out.xml
new file mode 100644
index 00000000..f7e65e5b
--- /dev/null
+++ b/occtax/src/main/res/anim/fade_out.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@android:integer/config_shortAnimTime"
+    android:fromAlpha="1.0"
+    android:interpolator="@android:interpolator/accelerate_quad"
+    android:toAlpha="0.0" />
diff --git a/occtax/src/main/res/drawable/ic_info.xml b/occtax/src/main/res/drawable/ic_info.xml
new file mode 100644
index 00000000..01487882
--- /dev/null
+++ b/occtax/src/main/res/drawable/ic_info.xml
@@ -0,0 +1,10 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/black"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z" />
+</vector>
diff --git a/occtax/src/main/res/drawable/ic_action_login.xml b/occtax/src/main/res/drawable/ic_login.xml
similarity index 74%
rename from occtax/src/main/res/drawable/ic_action_login.xml
rename to occtax/src/main/res/drawable/ic_login.xml
index 5e07fb89..3ac1fe9f 100644
--- a/occtax/src/main/res/drawable/ic_action_login.xml
+++ b/occtax/src/main/res/drawable/ic_login.xml
@@ -1,14 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:tintMode="multiply"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/action_drawable_color"
+        android:fillColor="@android:color/black"
         android:pathData="m12,3c-4.9587,0 -9,4.0413 -9,9 0,2.7605 1.2529,5.2358 3.2188,6.8887l1.0137,-1.7559C5.8581,15.8563 5,14.0322 5,12 5,8.1222 8.1222,5 12,5c3.8778,0 7,3.1222 7,7 0,2.0322 -0.8581,3.8563 -2.2324,5.1328l1.0137,1.7559C19.7471,17.2358 21,14.7605 21,12 21,7.0413 16.9587,3 12,3Z"/>
     <path
-        android:fillColor="@color/action_drawable_color"
+        android:fillColor="@android:color/black"
         android:pathData="m12,12.34 l5,8.6603H7Z"/>
 </vector>
diff --git a/occtax/src/main/res/drawable/ic_action_logout.xml b/occtax/src/main/res/drawable/ic_logout.xml
similarity index 75%
rename from occtax/src/main/res/drawable/ic_action_logout.xml
rename to occtax/src/main/res/drawable/ic_logout.xml
index db41cc8b..1fd87918 100644
--- a/occtax/src/main/res/drawable/ic_action_logout.xml
+++ b/occtax/src/main/res/drawable/ic_logout.xml
@@ -1,14 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:tintMode="multiply"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/action_drawable_color"
+        android:fillColor="@android:color/black"
         android:pathData="m12,3 l5,8.6603H7Z"/>
     <path
-        android:fillColor="@color/action_drawable_color"
+        android:fillColor="@android:color/black"
         android:pathData="m12,20.9997c-4.9587,0 -9,-4.0413 -9,-9C3,9.2392 4.2529,6.7639 6.2188,5.111L7.2324,6.8669C5.8581,8.1434 5,9.9675 5,11.9997c0,3.8778 3.1222,7 7,7 3.8778,0 7,-3.1222 7,-7C19,9.9675 18.1419,8.1434 16.7676,6.8669L17.7813,5.111C19.7471,6.7639 21,9.2392 21,11.9997c0,4.9587 -4.0413,9 -9,9z"/>
 </vector>
diff --git a/occtax/src/main/res/drawable/ic_action_settings.xml b/occtax/src/main/res/drawable/ic_settings.xml
similarity index 88%
rename from occtax/src/main/res/drawable/ic_action_settings.xml
rename to occtax/src/main/res/drawable/ic_settings.xml
index eba6d341..4b256664 100644
--- a/occtax/src/main/res/drawable/ic_action_settings.xml
+++ b/occtax/src/main/res/drawable/ic_settings.xml
@@ -2,11 +2,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:tintMode="multiply"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/action_drawable_color"
+        android:fillColor="@android:color/black"
         android:pathData="m 19.43,13 c 0.1,-0.67 0.08,-1.33 0,-2 l 2.11,-1.65 c 0.19,-0.15 0.24,-0.42 0.12,-0.64 l -2,-3.5 C 19.54,5.05 19.27,5 19.05,5.05 l -2.5,1 C 16.04,5.65 15.5,5.3 14.9,5.07 L 14.5,2.4 C 14.5,2.2 14.25,2 14,2 H 10 C 9.75,2 9.54,2.2 9.5,2.4 L 9.13,5.07 C 8.5,5.32 8,5.66 7.44,6.05 l -2.5,-1 C 4.7,5 4.46,5.05 4.34,5.27 l -2,3.46 C 2.2,9 2.27,9.2 2.5,9.4 l 2.1,1.65 c -0.1,0.67 -0.077,1.33 0,2 l -2.1,1.65 c -0.19,0.15 -0.24,0.42 -0.12,0.64 l 2,3.46 c 0.12,0.22 0.39,0.3 0.6,0.22 l 2.5,-1 c 0.5,0.4 1,0.73 1.7,1 l 0.38,2.65 C 9.54,21.82 9.75,22 10,22 h 4 c 0.25,0 0.46,-0.18 0.5,-0.4 l 0.4,-2.65 c 0.6,-0.25 1.17,-0.6 1.7,-1 l 2.5,1 c 0.23,0.1 0.5,0 0.6,-0.2 l 2,-3.5 c 0.1,-0.2 0.07,-0.5 -0.1,-0.64 z M 12,15.5 c -2,0 -3.5,-1.6 -3.5,-3.5 0,-2 1.6,-3.5 3.5,-3.5 2,0 3.5,1.6 3.5,3.5 0,2 -1.6,3.5 -3.5,3.5 z" />
 </vector>
diff --git a/occtax/src/main/res/drawable/ic_sync.xml b/occtax/src/main/res/drawable/ic_sync.xml
new file mode 100644
index 00000000..423cd47e
--- /dev/null
+++ b/occtax/src/main/res/drawable/ic_sync.xml
@@ -0,0 +1,10 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/black"
+        android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" />
+</vector>
diff --git a/occtax/src/main/res/drawable/ic_sync_problem.xml b/occtax/src/main/res/drawable/ic_sync_problem.xml
new file mode 100644
index 00000000..273ab6c9
--- /dev/null
+++ b/occtax/src/main/res/drawable/ic_sync_problem.xml
@@ -0,0 +1,10 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/black"
+        android:pathData="M3,12c0,2.21 0.91,4.2 2.36,5.64L3,20h6v-6l-2.24,2.24C5.68,15.15 5,13.66 5,12c0,-2.61 1.67,-4.83 4,-5.65L9,4.26C5.55,5.15 3,8.27 3,12zM11,17h2v-2h-2v2zM21,4h-6v6l2.24,-2.24C18.32,8.85 19,10.34 19,12c0,2.61 -1.67,4.83 -4,5.65v2.09c3.45,-0.89 6,-4.01 6,-7.74 0,-2.21 -0.91,-4.2 -2.36,-5.64L21,4zM11,13h2L13,7h-2v6z" />
+</vector>
diff --git a/occtax/src/main/res/drawable/side_nav_bar.xml b/occtax/src/main/res/drawable/side_nav_bar.xml
new file mode 100644
index 00000000..5b8f4ec2
--- /dev/null
+++ b/occtax/src/main/res/drawable/side_nav_bar.xml
@@ -0,0 +1,10 @@
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="135"
+        android:endColor="?attr/colorPrimaryDark"
+        android:centerColor="?attr/colorPrimaryDark"
+        android:startColor="?attr/colorPrimary"
+        android:type="linear" />
+</shape>
\ No newline at end of file
diff --git a/occtax/src/main/res/layout/activity_home.xml b/occtax/src/main/res/layout/activity_home.xml
index 16b5cbaf..4e4ecabb 100644
--- a/occtax/src/main/res/layout/activity_home.xml
+++ b/occtax/src/main/res/layout/activity_home.xml
@@ -1,83 +1,105 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
+<androidx.drawerlayout.widget.DrawerLayout
     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:id="@+id/homeContent"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.home.HomeActivity">
+    android:fitsSystemWindows="true"
+    tools:openDrawer="start">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/homeContent"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:context=".ui.home.HomeActivity">
 
-        <androidx.cardview.widget.CardView
-            android:id="@+id/cardViewAppSyncView"
+        <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/padding_default"
-            app:cardCornerRadius="@dimen/cardview_radius"
-            app:cardElevation="@dimen/cardview_elevation"
-            app:contentPadding="@dimen/padding_default"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <fr.geonature.occtax.ui.home.AppSyncView
-                android:id="@+id/appSyncView"
+            android:theme="@style/AppTheme.AppBarOverlay">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:action="@string/sync_action_synchronize"
-                app:action_enabled="false"
-                app:title="@string/sync_device_status" />
+                android:minHeight="?android:actionBarSize"
+                app:contentInsetStartWithNavigation="0dp"
+                app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-        </androidx.cardview.widget.CardView>
+        </com.google.android.material.appbar.AppBarLayout>
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar_inputs"
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/fragment_container_view"
+            android:name="fr.geonature.occtax.ui.home.LastObservationRecordsFragment"
             android:layout_width="match_parent"
-            android:layout_marginTop="@dimen/padding_default"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@+id/cardViewAppSyncView"
-            app:title="@string/home_last_inputs" />
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            tools:layout="@layout/fragment_recycler_view_fab" />
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-        <FrameLayout
+    <com.google.android.material.navigation.NavigationView
+        android:id="@+id/nav_view"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start">
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_margin="@dimen/padding_default"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/toolbar_inputs">
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <include
+                android:id="@+id/nav_header"
+                layout="@layout/drawer_header" />
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/inputRecyclerView"
+            <fr.geonature.occtax.ui.home.DrawerMenuEntryView
+                android:id="@+id/nav_menu_settings"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:padding="@dimen/padding_default"
+                app:icon="@drawable/ic_settings"
+                app:text1="@string/action_settings" />
 
-            <TextView
-                android:id="@+id/inputEmptyTextView"
+            <fr.geonature.occtax.ui.home.DrawerMenuEntryView
+                android:id="@+id/nav_menu_sync"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:text="@string/home_no_input"
-                android:visibility="gone" />
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:padding="@dimen/padding_default"
+                app:icon="@drawable/ic_sync"
+                app:text1="@string/action_data_sync" />
 
-        </FrameLayout>
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            <fr.geonature.occtax.ui.home.DrawerMenuEntryView
+                android:id="@+id/nav_menu_logout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:padding="@dimen/padding_default"
+                app:icon="@drawable/ic_logout"
+                app:text1="@string/action_logout" />
 
-    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_marginEnd="@dimen/padding_default"
-        android:layout_marginBottom="@dimen/padding_default"
-        android:clickable="true"
-        android:focusable="true"
-        android:text="@string/action_new_input"
-        android:visibility="visible"
-        app:elevation="@dimen/fab_elevation"
-        app:icon="@drawable/ic_add" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+            <fr.geonature.occtax.ui.home.DrawerMenuEntryView
+                android:id="@+id/nav_menu_about"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/padding_default"
+                app:icon="@drawable/ic_info"
+                app:text1="@string/action_about" />
+
+        </LinearLayout>
+
+    </com.google.android.material.navigation.NavigationView>
+
+</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/occtax/src/main/res/layout/drawer_header.xml b/occtax/src/main/res/layout/drawer_header.xml
new file mode 100644
index 00000000..fab5f4d7
--- /dev/null
+++ b/occtax/src/main/res/layout/drawer_header.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    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="wrap_content"
+    android:background="@drawable/side_nav_bar"
+    android:elevation="2dp"
+    android:orientation="vertical"
+    android:paddingHorizontal="@dimen/text_margin"
+    android:paddingTop="48dp"
+    android:paddingBottom="@dimen/text_margin"
+    android:theme="@style/AppTheme">
+
+    <TextView
+        android:id="@android:id/text1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLargeInverse"
+        android:visibility="gone"
+        tools:text="@tools:sample/last_names" />
+
+    <TextView
+        android:id="@android:id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMediumInverse"
+        android:visibility="gone"
+        tools:text="@tools:sample/first_names" />
+
+    <Button
+        android:id="@android:id/button1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:text="@string/action_login"
+        app:icon="@drawable/ic_login" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/occtax/src/main/res/layout/list_item_1.xml b/occtax/src/main/res/layout/list_item_1.xml
index c8075efd..a885c443 100644
--- a/occtax/src/main/res/layout/list_item_1.xml
+++ b/occtax/src/main/res/layout/list_item_1.xml
@@ -4,10 +4,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@android:id/text1"
     android:layout_width="match_parent"
-    android:layout_height="?attr/listPreferredItemHeight"
+    android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
     android:ellipsize="end"
     android:gravity="center_vertical"
+    android:minHeight="?attr/listPreferredItemHeight"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:singleLine="true"
diff --git a/occtax/src/main/res/layout/list_item_2.xml b/occtax/src/main/res/layout/list_item_2.xml
index d93a81c1..8ea063c3 100644
--- a/occtax/src/main/res/layout/list_item_2.xml
+++ b/occtax/src/main/res/layout/list_item_2.xml
@@ -4,8 +4,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="?attr/listPreferredItemHeight"
+    android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
+    android:minHeight="?attr/listPreferredItemHeight"
     android:paddingStart="?attr/listPreferredItemPaddingStart"
     android:paddingEnd="?attr/listPreferredItemPaddingEnd">
 
diff --git a/occtax/src/main/res/layout/list_item_input.xml b/occtax/src/main/res/layout/list_item_input.xml
index 592182e9..36d24386 100644
--- a/occtax/src/main/res/layout/list_item_input.xml
+++ b/occtax/src/main/res/layout/list_item_input.xml
@@ -4,8 +4,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="?attr/listPreferredItemHeight"
+    android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
+    android:minHeight="?attr/listPreferredItemHeight"
     android:paddingStart="?attr/listPreferredItemPaddingStart"
     android:paddingEnd="?attr/listPreferredItemPaddingEnd">
 
@@ -17,21 +18,24 @@
         android:singleLine="true"
         android:textAppearance="?attr/textAppearanceListItem"
         app:layout_constraintBottom_toBottomOf="@android:id/text2"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/chip_status"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/last_names" />
+        tools:text="@tools:sample/lorem/random" />
 
-    <com.google.android.material.chip.ChipGroup
-        android:id="@+id/chip_group_status"
+    <com.google.android.material.chip.Chip
+        android:id="@+id/chip_status"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:chipSpacing="@dimen/padding_default"
+        android:duplicateParentState="true"
+        android:maxLines="1"
+        android:padding="0dp"
+        app:chipIconSize="20dp"
+        app:chipMinHeight="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:singleLine="true"
-        app:singleSelection="true" />
+        tools:text="Draft" />
 
     <TextView
         android:id="@android:id/text2"
@@ -40,9 +44,9 @@
         android:ellipsize="end"
         android:singleLine="true"
         android:textAppearance="?attr/textAppearanceListItemSecondary"
-        app:layout_constraintEnd_toStartOf="@id/chip_group_status"
+        app:layout_constraintEnd_toStartOf="@id/chip_status"
         app:layout_constraintStart_toStartOf="@android:id/text1"
         app:layout_constraintTop_toBottomOf="@android:id/text1"
-        tools:text="@tools:sample/first_names" />
+        tools:text="@tools:sample/lorem/random" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/occtax/src/main/res/layout/view_app_sync.xml b/occtax/src/main/res/layout/view_app_sync.xml
deleted file mode 100644
index 968e7046..00000000
--- a/occtax/src/main/res/layout/view_app_sync.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge
-    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="wrap_content"
-    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
-
-    <TextView
-        android:id="@android:id/title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@string/sync_data"
-        android:textAllCaps="false"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toStartOf="@android:id/icon"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@android:id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="⬤"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large"
-        android:textColor="@color/datasync_status_unknown"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="HardcodedText,TextContrastCheck" />
-
-    <fr.geonature.occtax.ui.shared.view.ListItemActionView
-        android:id="@+id/list_item"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:action="@string/sync_action_synchronize"
-        app:layout_constraintTop_toBottomOf="@android:id/title"
-        app:visible_items="3" />
-
-</merge>
\ No newline at end of file
diff --git a/occtax/src/main/res/layout/view_drawer_menu_entry.xml b/occtax/src/main/res/layout/view_drawer_menu_entry.xml
new file mode 100644
index 00000000..e8349499
--- /dev/null
+++ b/occtax/src/main/res/layout/view_drawer_menu_entry.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge
+    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="wrap_content"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:duplicateParentState="true"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?android:attr/textColorPrimary"
+        tools:ignore="ContentDescription"
+        tools:src="@drawable/ic_info" />
+
+    <TextView
+        android:id="@android:id/text1"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/padding_default"
+        android:duplicateParentState="true"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textAppearance="?attr/textAppearanceListItem"
+        app:layout_constraintBottom_toBottomOf="@android:id/icon"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@android:id/icon"
+        app:layout_constraintTop_toTopOf="@android:id/icon"
+        tools:text="@tools:sample/last_names" />
+
+    <TextSwitcher
+        android:id="@android:id/text2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:duplicateParentState="true"
+        android:ellipsize="end"
+        android:inAnimation="@anim/fade_in"
+        android:outAnimation="@anim/fade_out"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="@android:id/text1"
+        app:layout_constraintStart_toStartOf="@android:id/text1"
+        app:layout_constraintTop_toBottomOf="@android:id/text1">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </TextSwitcher>
+
+</merge>
\ No newline at end of file
diff --git a/occtax/src/main/res/menu/login.xml b/occtax/src/main/res/menu/login.xml
deleted file mode 100644
index 1481ee7a..00000000
--- a/occtax/src/main/res/menu/login.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/menu_login"
-        android:icon="@drawable/ic_action_login"
-        android:title="@string/action_login"
-        app:showAsAction="never" />
-
-    <item
-        android:id="@+id/menu_logout"
-        android:icon="@drawable/ic_action_logout"
-        android:title="@string/action_logout"
-        app:showAsAction="never" />
-
-</menu>
\ No newline at end of file
diff --git a/occtax/src/main/res/menu/settings.xml b/occtax/src/main/res/menu/settings.xml
index 88e4bff9..2804015c 100644
--- a/occtax/src/main/res/menu/settings.xml
+++ b/occtax/src/main/res/menu/settings.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/menu_settings"
-        android:icon="@drawable/ic_action_settings"
+        android:icon="@drawable/ic_settings"
         android:title="@string/action_settings"
         app:showAsAction="never" />
 
diff --git a/occtax/src/main/res/menu/status.xml b/occtax/src/main/res/menu/status.xml
index 1f21720b..655ea283 100644
--- a/occtax/src/main/res/menu/status.xml
+++ b/occtax/src/main/res/menu/status.xml
@@ -2,12 +2,23 @@
 <menu
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <group android:checkableBehavior="all">
-        <item
-            android:id="@+id/menu_status_draft"
-            android:title="@string/home_input_status_draft" />
-        <item
-            android:id="@+id/menu_status_to_sync"
-            android:title="@string/home_input_status_to_sync" />
-    </group>
+
+    <item
+        android:icon="@drawable/ic_action_filter"
+        android:title="@string/action_filter"
+        app:showAsAction="always">
+        <menu>
+            <group
+                android:id="@+id/menu_status"
+                android:checkableBehavior="all">
+                <item
+                    android:id="@+id/menu_status_draft"
+                    android:title="@string/home_input_status_draft" />
+                <item
+                    android:id="@+id/menu_status_to_sync"
+                    android:title="@string/home_input_status_to_sync" />
+            </group>
+        </menu>
+    </item>
+
 </menu>
\ No newline at end of file
diff --git a/occtax/src/main/res/menu/sync.xml b/occtax/src/main/res/menu/sync.xml
new file mode 100644
index 00000000..2ff1b0a2
--- /dev/null
+++ b/occtax/src/main/res/menu/sync.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_sync"
+        android:checkable="false"
+        android:title="@string/action_input_sync"
+        android:tooltipText="@string/action_input_sync_hint"
+        app:iconTint="@color/actionbar_icon_tint"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/menu_sync_in_progress"
+        android:checkable="false"
+        android:title="@string/action_sync_in_progress"
+        android:visible="false"
+        app:actionViewClass="android.widget.ProgressBar"
+        app:showAsAction="ifRoom" />
+
+</menu>
\ No newline at end of file
diff --git a/occtax/src/main/res/values-fr/prefs.xml b/occtax/src/main/res/values-fr/prefs.xml
index 7ac194a0..0625c9fa 100644
--- a/occtax/src/main/res/values-fr/prefs.xml
+++ b/occtax/src/main/res/values-fr/prefs.xml
@@ -15,7 +15,5 @@
     <string name="preference_category_storage">Mémoire</string>
     <string name="preference_category_storage_internal">Mémoire interne</string>
     <string name="preference_category_storage_external">Mémoire externe</string>
-    <string name="preference_category_about">A propos</string>
-    <string name="preference_category_about_app_version">Version de l\'application</string>
 
 </resources>
\ No newline at end of file
diff --git a/occtax/src/main/res/values-fr/strings.xml b/occtax/src/main/res/values-fr/strings.xml
index 54ccafe4..53d03be2 100644
--- a/occtax/src/main/res/values-fr/strings.xml
+++ b/occtax/src/main/res/values-fr/strings.xml
@@ -16,20 +16,23 @@
     <string name="channel_name_data_synchronization">Synchronisation des données</string>
     <string name="channel_description_data_synchronization">Données locales à synchroniser</string>
 
-    <string name="sync_device_status">État du terminal</string>
     <string name="sync_data">Synchronisation des données</string>
-    <string name="sync_last_synchronization">Dernière synchronisation</string>
+    <string name="sync_last_synchronization">Dernière synchronisation\n%s</string>
     <string name="sync_last_synchronization_date">le EEE dd MMM yyyy à kk:mm:ss</string>
-    <string name="sync_last_synchronization_never">Jamais</string>
-    <string name="sync_inputs_not_synchronized">Relevés non synchronisés</string>
-    <string name="sync_action_synchronize">Synchroniser</string>
+    <string name="sync_last_synchronization_never">jamais</string>
 
+    <string name="home_drawer_open">Ouvrir le menu latéral</string>
+    <string name="home_drawer_close">Fermer le menu latéral</string>
     <string name="home_last_inputs">Derniers relevés</string>
     <string name="home_no_input">Aucun relevé en cours.\nCréer un nouveau relevé via le bouton +.</string>
+    <string name="home_first_sync">La synchronisation des données est en cours.\nVeuillez patienter.</string>
     <string name="home_input_date">EEE dd MMM yyyy</string>
     <string name="home_input_created_at">Relevé du %s</string>
     <string name="home_input_status_draft">En cours</string>
     <string name="home_input_status_to_sync">Terminé</string>
+    <string name="home_input_status_sync_in_progress">Synchronisation…</string>
+    <string name="home_input_status_sync_error">Échec</string>
+    <string name="home_input_status_sync_successful">Terminé</string>
     <plurals name="home_input_taxa_count">
         <item quantity="one">%d taxon</item>
         <item quantity="other">%d taxons</item>
@@ -42,8 +45,14 @@
     <string name="no_data">Aucune donnée</string>
 
     <string name="action_settings">Paramètres</string>
+    <string name="action_data_sync">Rafraîchir les données</string>
+    <string name="action_data_sync_in_progress">Synchronisation en cours…</string>
+    <string name="action_input_sync">Envoyer</string>
+    <string name="action_input_sync_hint">Envoyer les relevés</string>
+    <string name="action_sync_in_progress">Relevés en cours de synchronisation…</string>
     <string name="action_login">Se connecter</string>
     <string name="action_logout">Se déconnecter</string>
+    <string name="action_about">À propos</string>
     <string name="action_search">Recherche</string>
     <string name="action_filter">Filtres</string>
     <string name="action_new_input">relevé</string>
diff --git a/occtax/src/main/res/values/attrs.xml b/occtax/src/main/res/values/attrs.xml
index e9d7a09d..747c667f 100644
--- a/occtax/src/main/res/values/attrs.xml
+++ b/occtax/src/main/res/values/attrs.xml
@@ -27,4 +27,10 @@
         <attr name="visible_items" format="integer" />
     </declare-styleable>
 
+    <declare-styleable name="DrawerMenuEntryView">
+        <attr name="icon" />
+        <attr name="text1" format="reference" />
+        <attr name="text2" format="reference" />
+    </declare-styleable>
+
 </resources>
\ No newline at end of file
diff --git a/occtax/src/main/res/values/colors.xml b/occtax/src/main/res/values/colors.xml
index 2afa0595..2c856edc 100644
--- a/occtax/src/main/res/values/colors.xml
+++ b/occtax/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!-- https://material.io/resources/color/#!/?primary.color=43a047&secondary.color=f4511e -->
+    <!-- https://m2.material.io/resources/color/#!/?primary.color=43a047&secondary.color=f4511e -->
     <color name="primary">#43a047</color>
     <color name="primary_dark">#00701a</color>
     <color name="accent">#f4511e</color>
@@ -12,13 +12,11 @@
     <color name="grey_200">#eeeeee</color>
     <color name="grey_300">#e0e0e0</color>
 
-    <color name="datasync_status_ok">#689F38</color>
-    <color name="datasync_status_ko">#D32F2F</color>
-    <color name="datasync_status_pending">#FFA000</color>
-    <color name="datasync_status_unknown">#CCC</color>
-
     <color name="input_status_draft">#FFA000</color>
-    <color name="input_status_to_sync">#689F38</color>
+    <color name="input_status_to_sync">#3C963C</color>
+    <color name="input_status_sync_in_progress">#6EA03C</color>
+    <color name="input_status_sync_error">#E6501E</color>
+    <color name="input_status_sync_successful">#3C963C</color>
 
     <color name="area_observation_more_than_duration">#f00</color>
     <color name="area_observation_less_than_duration">#808080</color>
diff --git a/occtax/src/main/res/values/prefs.xml b/occtax/src/main/res/values/prefs.xml
index 75f8b1d0..28daca81 100644
--- a/occtax/src/main/res/values/prefs.xml
+++ b/occtax/src/main/res/values/prefs.xml
@@ -21,8 +21,5 @@
     <string name="preference_category_storage_internal_key" translatable="false">storage_internal</string>
     <string name="preference_category_storage_external">External storage</string>
     <string name="preference_category_storage_external_key" translatable="false">storage_external</string>
-    <string name="preference_category_about">About</string>
-    <string name="preference_category_about_app_version_key" translatable="false">app_version</string>
-    <string name="preference_category_about_app_version">App version</string>
 
 </resources>
\ No newline at end of file
diff --git a/occtax/src/main/res/values/strings.xml b/occtax/src/main/res/values/strings.xml
index c0f08bdd..0a8d909d 100644
--- a/occtax/src/main/res/values/strings.xml
+++ b/occtax/src/main/res/values/strings.xml
@@ -19,20 +19,23 @@
     <string name="channel_name_data_synchronization">Data synchronization</string>
     <string name="channel_description_data_synchronization">Data to synchronize</string>
 
-    <string name="sync_device_status">Device status</string>
     <string name="sync_data">Data synchronization</string>
-    <string name="sync_last_synchronization">Last synchronization</string>
+    <string name="sync_last_synchronization">Last synchronization\n%s</string>
     <string name="sync_last_synchronization_date">EEE dd MMM yyyy, kk:mm:ss</string>
-    <string name="sync_last_synchronization_never">Never</string>
-    <string name="sync_inputs_not_synchronized">Inputs not synchronized</string>
-    <string name="sync_action_synchronize">Synchronize</string>
+    <string name="sync_last_synchronization_never">never</string>
 
+    <string name="home_drawer_open">Open drawer menu</string>
+    <string name="home_drawer_close">Close drawer menu</string>
     <string name="home_last_inputs">Last inputs</string>
     <string name="home_no_input">No existing input.\nCreate a new one by tapping the + button.</string>
+    <string name="home_first_sync">Data synchronization in progress.\nPlease wait.</string>
     <string name="home_input_date">EEE dd MMM yyyy</string>
     <string name="home_input_created_at">Input from %s</string>
     <string name="home_input_status_draft">Draft</string>
     <string name="home_input_status_to_sync">Ready to sync</string>
+    <string name="home_input_status_sync_in_progress">In progress…</string>
+    <string name="home_input_status_sync_error">Failed</string>
+    <string name="home_input_status_sync_successful">Success</string>
     <plurals name="home_input_taxa_count">
         <item quantity="one">%d taxon</item>
         <item quantity="other">%d taxa</item>
@@ -44,8 +47,14 @@
     <string name="no_data">No data</string>
 
     <string name="action_settings">Settings</string>
+    <string name="action_data_sync">Synchronize local data</string>
+    <string name="action_data_sync_in_progress">Data synchronization in progress…</string>
+    <string name="action_input_sync">Send</string>
+    <string name="action_input_sync_hint">Synchronize inputs</string>
+    <string name="action_sync_in_progress">Inputs synchronization in progress…</string>
     <string name="action_login">Sign in</string>
     <string name="action_logout">Sign out</string>
+    <string name="action_about">About</string>
     <string name="action_search">Search</string>
     <string name="action_filter">Apply filters</string>
     <string name="action_new_input">input</string>
diff --git a/occtax/src/main/res/values/styles.xml b/occtax/src/main/res/values/styles.xml
index 29640563..fe8c7956 100644
--- a/occtax/src/main/res/values/styles.xml
+++ b/occtax/src/main/res/values/styles.xml
@@ -17,6 +17,8 @@
         <item name="underlinePageIndicatorStyle">@style/UnderlinePageIndicator</item>
 
         <item name="materialThemeOverlay">@style/ButtonThemeOverlay</item>
+        <item name="textAppearanceHeadline6">@style/TextAppearance.App.Headline6</item>
+        <item name="textAppearanceSubtitle1">@style/TextAppearance.App.Subtitle1</item>
 
     </style>
 
@@ -45,6 +47,13 @@
 
     </style>
 
+    <style name="TextAppearance.App.Headline6" parent="TextAppearance.MaterialComponents.Headline6">
+        <item name="android:textSize">18sp</item>
+    </style>
+    <style name="TextAppearance.App.Subtitle1" parent="TextAppearance.MaterialComponents.Subtitle1">
+        <item name="android:textSize">12sp</item>
+    </style>
+
     <style name="ActionBar.Login" parent="Widget.AppCompat.ActionBar.Solid">
         <item name="android:background">?attr/colorPrimaryDark</item>
         <item name="background">?attr/colorPrimaryDark</item>
diff --git a/occtax/src/main/res/xml/preferences_about.xml b/occtax/src/main/res/xml/preferences_about.xml
deleted file mode 100644
index b7c8fa3d..00000000
--- a/occtax/src/main/res/xml/preferences_about.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <PreferenceCategory android:title="@string/preference_category_about">
-        <Preference
-            android:key="@string/preference_category_about_app_version_key"
-            android:selectable="false"
-            android:title="@string/preference_category_about_app_version" />
-    </PreferenceCategory>
-
-</PreferenceScreen>
\ No newline at end of file
diff --git a/occtax/src/test/java/fr/geonature/occtax/features/nomenclature/domain/EditableNomenclatureTypeTest.kt b/occtax/src/test/java/fr/geonature/occtax/features/nomenclature/domain/EditableNomenclatureTypeTest.kt
index fa09560b..65da49e1 100644
--- a/occtax/src/test/java/fr/geonature/occtax/features/nomenclature/domain/EditableNomenclatureTypeTest.kt
+++ b/occtax/src/test/java/fr/geonature/occtax/features/nomenclature/domain/EditableNomenclatureTypeTest.kt
@@ -2,6 +2,7 @@ package fr.geonature.occtax.features.nomenclature.domain
 
 import android.os.Bundle
 import android.os.Parcel
+import fr.geonature.compat.os.getParcelableArrayCompat
 import fr.geonature.occtax.features.record.domain.PropertyValue
 import kotlinx.parcelize.parcelableCreator
 import org.junit.Assert.assertArrayEquals
@@ -125,7 +126,7 @@ class EditableNomenclatureTypeTest {
         // then
         assertArrayEquals(
             expectedEditableNomenclatureTypes.toTypedArray(),
-            bundle.getParcelableArray("editable_nomenclature_types")
+            bundle.getParcelableArrayCompat("editable_nomenclature_types")
         )
     }
 }
\ No newline at end of file
diff --git a/occtax/src/test/java/fr/geonature/occtax/features/record/data/ObservationRecordDataSourceTest.kt b/occtax/src/test/java/fr/geonature/occtax/features/record/data/ObservationRecordDataSourceTest.kt
index e87adcd7..788d681d 100644
--- a/occtax/src/test/java/fr/geonature/occtax/features/record/data/ObservationRecordDataSourceTest.kt
+++ b/occtax/src/test/java/fr/geonature/occtax/features/record/data/ObservationRecordDataSourceTest.kt
@@ -70,9 +70,15 @@ class ObservationRecordDataSourceTest {
     fun `should save and read observation records`() =
         runTest {
             // given some observation records to save and read
-            val record1 = ObservationRecord(internalId = 1234)
-            val record2 = ObservationRecord(internalId = 1235)
-            val record3 = ObservationRecord(internalId = 1237)
+            val record1 = ObservationRecord(internalId = 1234).apply {
+                dates.start = toDate("2016-10-28T08:15:00Z")!!
+            }
+            val record2 = ObservationRecord(internalId = 1235).apply {
+                dates.start = toDate("2016-10-28T10:15:00Z")!!
+            }
+            val record3 = ObservationRecord(internalId = 1237).apply {
+                dates.start = toDate("2016-10-28T09:15:00Z")!!
+            }
 
             observationRecordLocalDataSource.save(record1)
             observationRecordLocalDataSource.save(record2)
@@ -82,12 +88,14 @@ class ObservationRecordDataSourceTest {
             val record4 = ObservationRecord(
                 internalId = 1236,
                 status = ObservationRecord.Status.TO_SYNC
-            )
+            ).apply {
+                dates.start = toDate("2016-10-28T07:15:00Z")!!
+            }
             File(
                 FileUtils
                     .getInputsFolder(application)
                     .also { it.mkdirs() },
-                "input_${record4.id}.json"
+                "input_${record4.internalId}.json"
             )
                 .bufferedWriter()
                 .use { out ->
@@ -102,10 +110,10 @@ class ObservationRecordDataSourceTest {
             // then
             assertArrayEquals(
                 arrayOf(
-                    record1.internalId to record1.status,
                     record2.internalId to record2.status,
-                    record4.internalId to record4.status,
                     record3.internalId to record3.status,
+                    record1.internalId to record1.status,
+                    record4.internalId to record4.status
                 ),
                 observationRecords.map { it.internalId to it.status }
                     .toTypedArray()
diff --git a/occtax/src/test/java/fr/geonature/occtax/features/record/presentation/ObservationRecordViewModelTest.kt b/occtax/src/test/java/fr/geonature/occtax/features/record/presentation/ObservationRecordViewModelTest.kt
index aec880c8..78a441ed 100644
--- a/occtax/src/test/java/fr/geonature/occtax/features/record/presentation/ObservationRecordViewModelTest.kt
+++ b/occtax/src/test/java/fr/geonature/occtax/features/record/presentation/ObservationRecordViewModelTest.kt
@@ -1,7 +1,13 @@
 package fr.geonature.occtax.features.record.presentation
 
+import android.app.Application
+import android.util.Log
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
+import androidx.test.core.app.ApplicationProvider
+import androidx.work.Configuration
+import androidx.work.testing.SynchronousExecutor
+import androidx.work.testing.WorkManagerTestInitHelper.initializeTestWorkManager
 import fr.geonature.occtax.CoroutineTestRule
 import fr.geonature.occtax.features.record.domain.ObservationRecord
 import fr.geonature.occtax.features.record.domain.PropertyValue
@@ -27,6 +33,8 @@ import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
 
 /**
  * Unit tests about [ObservationRecordViewModel].
@@ -34,6 +42,7 @@ import org.junit.Test
  * @author S. Grimault
  */
 @ExperimentalCoroutinesApi
+@RunWith(RobolectricTestRunner::class)
 class ObservationRecordViewModelTest {
 
     @get:Rule
@@ -42,6 +51,8 @@ class ObservationRecordViewModelTest {
     @get:Rule
     val coroutineTestRule = CoroutineTestRule()
 
+    private lateinit var application: Application
+
     @RelaxedMockK
     private lateinit var getAllObservationRecordsUseCase: GetAllObservationRecordsUseCase
 
@@ -72,7 +83,18 @@ class ObservationRecordViewModelTest {
     fun setUp() {
         init(this)
 
+        application = ApplicationProvider.getApplicationContext()
+
+        initializeTestWorkManager(
+            application,
+            Configuration.Builder()
+                .setMinimumLoggingLevel(Log.DEBUG)
+                .setExecutor(SynchronousExecutor())
+                .build()
+        )
+
         observationRecordViewModel = ObservationRecordViewModel(
+            application,
             getAllObservationRecordsUseCase,
             saveObservationRecordUseCase,
             editObservationRecordUseCase,
diff --git a/occtax/src/test/java/fr/geonature/occtax/features/record/repository/SynchronizeObservationRecordRepositoryTest.kt b/occtax/src/test/java/fr/geonature/occtax/features/record/repository/SynchronizeObservationRecordRepositoryTest.kt
index f9bd6e2a..e047560c 100644
--- a/occtax/src/test/java/fr/geonature/occtax/features/record/repository/SynchronizeObservationRecordRepositoryTest.kt
+++ b/occtax/src/test/java/fr/geonature/occtax/features/record/repository/SynchronizeObservationRecordRepositoryTest.kt
@@ -13,7 +13,6 @@ import fr.geonature.datasync.api.model.AuthLogin
 import fr.geonature.datasync.api.model.AuthUser
 import fr.geonature.datasync.auth.IAuthManager
 import fr.geonature.datasync.auth.error.AuthException
-import fr.geonature.datasync.packageinfo.ISynchronizeObservationRecordRepository
 import fr.geonature.datasync.settings.DataSyncSettings
 import fr.geonature.datasync.settings.error.DataSyncSettingsNotFoundException
 import fr.geonature.occtax.CoroutineTestRule
@@ -105,7 +104,30 @@ class SynchronizeObservationRecordRepositoryTest {
             coEvery { authManager.getAuthLogin() } returns null
 
             // when trying to synchronize an observation record from ID
-            val result = synchronizeObservationRecordRepository(1234L)
+            val result = synchronizeObservationRecordRepository.synchronize(
+                ObservationRecord(internalId = 1240L).apply {
+                    comment.comment = "some comment"
+                    taxa.add(
+                        Taxon(
+                            8L,
+                            "taxon_02",
+                            Taxonomy(
+                                "Animalia",
+                                "Ascidies"
+                            )
+                        )
+                    )
+                        .apply {
+                            PropertyValue.Text(
+                                "some_code",
+                                "some_value"
+                            )
+                                .also {
+                                    properties[it.code] = it
+                                }
+                        }
+                }
+            )
 
             // then
             assertTrue(result.isFailure)
@@ -135,7 +157,30 @@ class SynchronizeObservationRecordRepositoryTest {
             coEvery { appSettingsManager.loadAppSettings() } returns null
 
             // when trying to synchronize an observation record from ID
-            val result = synchronizeObservationRecordRepository(1234L)
+            val result = synchronizeObservationRecordRepository.synchronize(
+                ObservationRecord(internalId = 1240L).apply {
+                    comment.comment = "some comment"
+                    taxa.add(
+                        Taxon(
+                            8L,
+                            "taxon_02",
+                            Taxonomy(
+                                "Animalia",
+                                "Ascidies"
+                            )
+                        )
+                    )
+                        .apply {
+                            PropertyValue.Text(
+                                "some_code",
+                                "some_value"
+                            )
+                                .also {
+                                    properties[it.code] = it
+                                }
+                        }
+                }
+            )
 
             // then
             assertTrue(result.isFailure)
@@ -172,7 +217,30 @@ class SynchronizeObservationRecordRepositoryTest {
             )
 
             // when trying to synchronize an observation record from ID
-            val result = synchronizeObservationRecordRepository(1234L)
+            val result = synchronizeObservationRecordRepository.synchronize(
+                ObservationRecord(internalId = 1240L).apply {
+                    comment.comment = "some comment"
+                    taxa.add(
+                        Taxon(
+                            8L,
+                            "taxon_02",
+                            Taxonomy(
+                                "Animalia",
+                                "Ascidies"
+                            )
+                        )
+                    )
+                        .apply {
+                            PropertyValue.Text(
+                                "some_code",
+                                "some_value"
+                            )
+                                .also {
+                                    properties[it.code] = it
+                                }
+                        }
+                }
+            )
 
             // then
             assertTrue(result.isFailure)
@@ -217,11 +285,13 @@ class SynchronizeObservationRecordRepositoryTest {
             )
             coEvery { appSettingsManager.loadAppSettings() } returns appSettings
             coEvery {
-                observationRecordRemoteDataSource.setBaseUrl(appSettings.dataSyncSettings?.geoNatureServerUrl!!)
+                observationRecordRemoteDataSource.setBaseUrl(
+                    appSettings.dataSyncSettings?.geoNatureServerUrl!!
+                )
             } returns Unit
 
             // and an existing observation record with wrong status
-            coEvery { observationRecordLocalDataSource.read(1240L) } returns ObservationRecord(internalId = 1240L).apply {
+            val observationRecord = ObservationRecord(internalId = 1240L).apply {
                 comment.comment = "some comment"
                 taxa.add(
                     Taxon(
@@ -245,7 +315,7 @@ class SynchronizeObservationRecordRepositoryTest {
             }
 
             // when trying to synchronize an observation record from ID
-            val result = synchronizeObservationRecordRepository(1240L)
+            val result = synchronizeObservationRecordRepository.synchronize(observationRecord)
 
             // then
             assertTrue(result.isFailure)
@@ -289,7 +359,9 @@ class SynchronizeObservationRecordRepositoryTest {
         )
         coEvery { appSettingsManager.loadAppSettings() } returns appSettings
         coEvery {
-            observationRecordRemoteDataSource.setBaseUrl(appSettings.dataSyncSettings?.geoNatureServerUrl!!)
+            observationRecordRemoteDataSource.setBaseUrl(
+                appSettings.dataSyncSettings?.geoNatureServerUrl!!
+            )
         } returns Unit
 
         // and an existing observation to synchronize
@@ -318,7 +390,6 @@ class SynchronizeObservationRecordRepositoryTest {
                         }
                 }
         }
-        coEvery { observationRecordLocalDataSource.read(1240L) } returns expectedObservationRecordToSend
         coEvery {
             observationRecordRemoteDataSource.sendObservationRecord(
                 any(),
@@ -332,16 +403,20 @@ class SynchronizeObservationRecordRepositoryTest {
             )
         } answers { firstArg() }
         coEvery { observationRecordRemoteDataSource.deleteObservationRecord(any()) } returns Unit
-        coEvery { observationRecordLocalDataSource.delete(expectedObservationRecordToSend.internalId) } returns expectedObservationRecordToSend
+        coEvery {
+            observationRecordLocalDataSource.delete(expectedObservationRecordToSend.internalId)
+        } returns expectedObservationRecordToSend
 
         // when trying to synchronize an observation record from ID
-        val result = synchronizeObservationRecordRepository(1240L)
+        val result =
+            synchronizeObservationRecordRepository.synchronize(expectedObservationRecordToSend)
 
         // then
         assertTrue(result.isSuccess)
         coVerifySequence {
-            observationRecordRemoteDataSource.setBaseUrl(appSettings.dataSyncSettings?.geoNatureServerUrl!!)
-            observationRecordLocalDataSource.read(expectedObservationRecordToSend.internalId)
+            observationRecordRemoteDataSource.setBaseUrl(
+                appSettings.dataSyncSettings?.geoNatureServerUrl!!
+            )
             observationRecordRemoteDataSource.sendObservationRecord(
                 expectedObservationRecordToSend,
                 appSettings
@@ -396,7 +471,9 @@ class SynchronizeObservationRecordRepositoryTest {
         )
         coEvery { appSettingsManager.loadAppSettings() } returns appSettings
         coEvery {
-            observationRecordRemoteDataSource.setBaseUrl(appSettings.dataSyncSettings?.geoNatureServerUrl!!)
+            observationRecordRemoteDataSource.setBaseUrl(
+                appSettings.dataSyncSettings?.geoNatureServerUrl!!
+            )
         } returns Unit
 
         // and an existing observation to synchronize
@@ -426,7 +503,6 @@ class SynchronizeObservationRecordRepositoryTest {
                 }
         }
 
-        coEvery { observationRecordLocalDataSource.read(1240L) } returns expectedObservationRecordToSend
         coEvery {
             observationRecordRemoteDataSource.sendObservationRecord(
                 any(),
@@ -440,12 +516,16 @@ class SynchronizeObservationRecordRepositoryTest {
                 any()
             )
         } answers {
-            throw ObservationRecordException.SynchronizeException(firstArg<ObservationRecord>().internalId)
+            throw ObservationRecordException.SynchronizeException(
+                firstArg<ObservationRecord>().internalId
+            )
         }
         coEvery { observationRecordRemoteDataSource.deleteObservationRecord(any()) } returns Unit
 
         // when trying to synchronize an observation record from ID
-        val result = synchronizeObservationRecordRepository(1240L)
+        val result = synchronizeObservationRecordRepository.synchronize(
+            expectedObservationRecordToSend
+        )
 
         // then
         assertTrue(result.isFailure)
@@ -455,8 +535,9 @@ class SynchronizeObservationRecordRepositoryTest {
             (result.exceptionOrNull() as ObservationRecordException.SynchronizeException).id
         )
         coVerifySequence {
-            observationRecordRemoteDataSource.setBaseUrl(appSettings.dataSyncSettings?.geoNatureServerUrl!!)
-            observationRecordLocalDataSource.read(expectedObservationRecordToSend.internalId)
+            observationRecordRemoteDataSource.setBaseUrl(
+                appSettings.dataSyncSettings?.geoNatureServerUrl!!
+            )
             observationRecordRemoteDataSource.sendObservationRecord(
                 expectedObservationRecordToSend,
                 appSettings
@@ -465,7 +546,9 @@ class SynchronizeObservationRecordRepositoryTest {
                 expectedObservationRecordToSend.copy(id = 1234L),
                 appSettings
             )
-            observationRecordRemoteDataSource.deleteObservationRecord(expectedObservationRecordToSend.copy(id = 1234L))
+            observationRecordRemoteDataSource.deleteObservationRecord(
+                expectedObservationRecordToSend.copy(id = 1234L)
+            )
         }
         coVerify(inverse = true) {
             observationRecordLocalDataSource.delete(expectedObservationRecordToSend.internalId)
diff --git a/occtax/src/test/java/fr/geonature/occtax/settings/NomenclatureSettingsTest.kt b/occtax/src/test/java/fr/geonature/occtax/settings/NomenclatureSettingsTest.kt
index 411a3138..1a3d1e5f 100644
--- a/occtax/src/test/java/fr/geonature/occtax/settings/NomenclatureSettingsTest.kt
+++ b/occtax/src/test/java/fr/geonature/occtax/settings/NomenclatureSettingsTest.kt
@@ -1,6 +1,7 @@
 package fr.geonature.occtax.settings
 
 import android.os.Parcel
+import kotlinx.parcelize.parcelableCreator
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -88,7 +89,7 @@ class NomenclatureSettingsTest {
         // then
         assertEquals(
             nomenclatureSettings,
-            NomenclatureSettings.CREATOR.createFromParcel(parcel)
+            parcelableCreator<NomenclatureSettings>().createFromParcel(parcel)
         )
     }
 }
\ No newline at end of file
diff --git a/occtax/src/test/java/fr/geonature/occtax/settings/io/AppSettingsJsonReaderTest.kt b/occtax/src/test/java/fr/geonature/occtax/settings/io/AppSettingsJsonReaderTest.kt
index 3211138d..dee018f7 100644
--- a/occtax/src/test/java/fr/geonature/occtax/settings/io/AppSettingsJsonReaderTest.kt
+++ b/occtax/src/test/java/fr/geonature/occtax/settings/io/AppSettingsJsonReaderTest.kt
@@ -50,7 +50,7 @@ class AppSettingsJsonReaderTest {
                     arrayListOf(
                         LayerSettings(
                             "Nantes",
-                            "nantes.mbtiles"
+                            listOf("nantes.mbtiles")
                         )
                     ),
                     null,
diff --git a/settings.gradle b/settings.gradle
index 3df5990a..dbc0415e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':commons', ':datasync', ':mountpoint', ':viewpager', ':maps', ':occtax'
+include ':commons', ':compat', ':datasync', ':maps', ':mountpoint', ':viewpager', ':occtax'