diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bef40e30..111c1491a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,58 @@
 # Changelog
 
+## [1.0.8-rc14] - unstable
+
+### Added
+
+* [PostIt] Ajout d'un `BillingQueryDetailsPageViewModel` et de sa page associee pour afficher le detail d'une commande billing depuis l'historique.
+* [PostIt] Ajout d'un mode detail avec section metier (statut, date, description, motif, infos) et section technique repliable (code, client, provision, lieu, prestations).
+* [PostIt] Ajout d'un badge de statut enrichi (couleur + pictogramme) sur le detail d'une commande pour visualiser l'etat en un coup d'oeil.
+* [PostIt] Ajout d'un bloc d'actions rapide en tete du detail (`Retour`, `Ouvrir en edition`) pour eviter le scroll jusqu'au bas de page.
+* [PostIt] Ajout d'un style monospace sur les metadonnees techniques (code billing, client, provision, lieu, prestations) pour faciliter la lecture des identifiants et valeurs brutes.
+
+### Changed
+
+* [PostIt] Le bouton d'ouverture depuis la liste billing ouvre maintenant une page de detail dediee avant l'eventuelle edition.
+* [PostIt] Amelioration UX des pages billing: badges de statut colores, actions remontees en haut de page, et typographie monospace sur les metadonnees techniques.
+
+### Fixed
+
+* [Yavsc.Api] Correction d'un 500 sur le refresh du catalogue d'activites lorsque `Activity.Description` est `NULL` en base (nullabilite explicite + projection null-safe + gardes sur codes vides).
+* [Yavsc.Api] Correction des erreurs 400/500 sur les routes billing (`Rdv`, `Brush`, `MBrush`) en imposant `ClientId` depuis l'utilisateur authentifie et en ignorant les champs server-owned lors de la validation modele.
+* [Yavsc.Api] Correction du `PUT /api/v1/billing/Rdv/{id}`: mise a jour controlee de l'entite existante (et non remplacement brut du graphe JSON), ce qui supprime les `BadRequest` parasites.
+* [Yavsc.Api] Correction PostgreSQL `timestamptz` sur RDV: normalisation UTC de `EventDate` sur `POST/PUT /api/v1/billing/Rdv` pour eviter l'erreur `Cannot write DateTime with Kind=Local`.
+* [Yavsc.Api] Correction du flux FrontOffice accept/reject de query: sauvegarde avec contexte utilisateur et fallback d'injection pour `IBillingService` afin d'eviter les erreurs serveur en environnement de test.
+* [Yavsc.Blogs] Correction des `BadRequest` sur `POST/PUT /api/v1/blogspot` avec payload JSON (PostIt): les proprietes de navigation/serveur (`Author`, `Tags`, `Comments`, audit) ne bloquent plus la validation.
+* [Yavsc.Org] Correction du flux MVC de creation de commentaire: `SaveChangesAsync(userId)` est utilise pour renseigner les champs d'audit requis (`UserCreated`/`UserModified`).
+* [Yavsc.Api.Test] Stabilisation des fixtures de seed billing: remplissage des metadonnees d'audit (`UserCreated`, `UserModified`, dates) pour eviter les echecs SQLite `NOT NULL`.
+
+## [1.0.8-rc13] - unstable
+
+### Added
+
+* [PostIt] Integration d'un selecteur de lieu RDV base sur Mapsui (carte interactive dans le formulaire `Rdv`).
+* [PostIt] Ajout d'un marqueur de position et d'une action de recentrage sur la carte RDV.
+* [PostIt] Ajout d'un service de reverse geocoding pour suggerer une adresse a partir des coordonnees carte.
+* [PostIt] Cache et debounce des resolutions d'adresse RDV pour limiter les appels reseau et lisser l'UX.
+* [PostIt.Tests] Nouvelles non-regressions sur le panneau d'adresse suggeree RDV et le comportement de la carte.
+* [Yavsc.Abstract] Activation de `#nullable enable annotations` sur les fichiers legacy avec annotations nullable.
+* [Yavsc.Server] Activation de `#nullable enable annotations` sur les fichiers legacy avec annotations nullable.
+
+### Changed
+
+* [PostIt] Generalisation de la barre de statut d'action (severite explicite) sur pages principales, dialogues et formulaires billing.
+* [PostIt] Harmonisation des messages de statut utilisateur en francais.
+* [PostIt] Renforcement des gardes de navigation dans les flux de gestion des membres de cercle.
+* [PostIt] Le flux RDV conserve l'adresse saisie manuellement et propose l'adresse resolue comme suggestion explicite.
+* [PostIt] Le flux de geolocalisation RDV tolere les positions proches dans le cache de suggestion d'adresse.
+
+### Fixed
+
+* [PostIt.Desktop] Correction d'un crash au demarrage OIDC (`No authority specified`) via durcissement des valeurs par defaut de configuration d'authentification.
+* [PostIt] Correction de la persistance des settings: l'etat runtime de statut n'est plus serialize dans le JSON utilisateur.
+* [PostIt.Tests] Ajout d'un verrou de non-regression sur le premier chargement des settings.
+* [PostIt] Correction du binding de la date RDV: `DatePicker.SelectedDate` est aligne sur un proxy `DateTimeOffset?` (`EventDateSelection`).
+
 ## [1.0.8-rc12] - unstable
 
 ### Added
@@ -13,12 +66,14 @@
 
 * [PostIt] Les avatars ne sont plus relies en string sur `Image.Source`: ils sont telecharges et lies en `Bitmap`.
 * [Yavsc.Api.Client] `ActivityApiClient` accepte une base d'avatar dediee et construit les URLs avatar depuis l'autorite d'identification.
+* [PostIt] Les clients Activites/Billing utilisent maintenant `ApiUrl` en lecture dynamique: un changement via Parametres prend effet sans redemarrer l'application (apres sauvegarde et rafraichissement de la page).
 * [PostIt] Le header de `MainPage` n'utilise plus `ScrollViewer`; remplacement par une barre de commandes basee sur `WrapPanel`.
 * [PostIt] Alignement de la navigation blogs: renommage `PushMainPageAsync` -> `PushBlogsPageAsync` et ajustement de `HomePageViewModel`.
 
 ### Fixed
 
-néant
+* [PostIt.Android] Correction d'un 404 sur la page Activites au premier lancement: la configuration embarquee pointait `ApiUrl` vers le host Blogs au lieu de l'API metier.
+* [PostIt] Correction du bouton Sauver de la page Parametres: binding vers `SaveCommand` pour persister correctement `ApiUrl`/`BlogsApiUrl`.
 
 ## [1.0.8-rc11] - unstable
 
diff --git a/src/PostIt/Directory.Packages.props b/src/PostIt/Directory.Packages.props
index 4dd4b2889..2f27340e9 100644
--- a/src/PostIt/Directory.Packages.props
+++ b/src/PostIt/Directory.Packages.props
@@ -16,6 +16,8 @@
         <PackageVersion Include="Avalonia.Headless" Version="$(AvaloniaVersionBase)" />
         <PackageVersion Include="Avalonia.Headless.Xunit" Version="$(AvaloniaVersionBase)" />
         <PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersionBase)" />
+        <PackageVersion Include="Mapsui" Version="5.1.0" />
+        <PackageVersion Include="Mapsui.Avalonia12" Version="5.1.0" />
 
         <PackageVersion Include="Material.Avalonia" Version="3.19.0" />
         <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.3" />
diff --git a/src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs b/src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs
index 2e8d3e544..04cc0f314 100644
--- a/src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs
+++ b/src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs
@@ -39,6 +39,22 @@ public class ActivitiesPageViewModelTests
         Assert.Equal("https://business.example/api/v1/billing/Rdv", api.Paths[3]);
     }
 
+    [Fact]
+    public async Task ActivityApiClient_uses_updated_business_base_without_restart()
+    {
+        var api = new StubActivityApi();
+        var baseUrl = "https://business-a.example/api/v1/";
+        var client = new ActivityApiClient(api, () => baseUrl);
+
+        await client.GetCatalogAsync(ct: TestContext.Current.CancellationToken);
+
+        baseUrl = "https://business-b.example/api/v1/";
+        await client.GetUsersAsync("brush", TestContext.Current.CancellationToken);
+
+        Assert.Equal("https://business-a.example/api/v1/activity/catalog", api.Paths[0]);
+        Assert.Equal("https://business-b.example/api/v1/activity/brush/users", api.Paths[1]);
+    }
+
     [Fact]
     public async Task RefreshAsync_loads_first_activity_then_specialization_performers()
     {
diff --git a/src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs b/src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs
index c7b5b926b..17fcc968c 100644
--- a/src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs
+++ b/src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs
@@ -115,6 +115,89 @@ public class BillingCommandPageViewModelTests
         }
     }
 
+    [Fact]
+    public void ApplyLocationFromMap_sets_coordinates_and_updates_status()
+    {
+        var api = new RecordingApi();
+        var client = new BillingApiClient(api, "https://business.example/api/v1/");
+        var vm =
+            new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
+            .CreateCommandPageViewModel(
+                new ActivityInfo { Code = "dev", Name = "Développement" },
+                new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
+                client) as RdvViewModel;
+
+        vm!.Address = string.Empty;
+        vm.ApplyLocationFromMap(48.85661234, 2.35224567);
+
+        Assert.Equal(48.856612, vm.Latitude);
+        Assert.Equal(2.352246, vm.Longitude);
+        Assert.Contains("Position sélectionnée", vm.StatusMessage, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public void EventDateSelection_round_trips_with_EventDate_for_DatePicker_binding()
+    {
+        var api = new RecordingApi();
+        var client = new BillingApiClient(api, "https://business.example/api/v1/");
+        var vm =
+            new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
+            .CreateCommandPageViewModel(
+                new ActivityInfo { Code = "dev", Name = "Développement" },
+                new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
+                client) as RdvViewModel;
+
+        var selected = new DateTimeOffset(2026, 9, 7, 14, 30, 0, TimeSpan.FromHours(2));
+        vm!.EventDateSelection = selected;
+
+        Assert.Equal(selected.LocalDateTime, vm.EventDate);
+        Assert.Equal(vm.EventDate, vm.EventDateSelection!.Value.LocalDateTime);
+    }
+
+    [Fact]
+    public void ApplyResolvedAddress_populates_empty_address_directly()
+    {
+        var api = new RecordingApi();
+        var client = new BillingApiClient(api, "https://business.example/api/v1/");
+        var vm =
+            new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
+            .CreateCommandPageViewModel(
+                new ActivityInfo { Code = "dev", Name = "Développement" },
+                new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
+                client) as RdvViewModel;
+
+        vm!.Address = string.Empty;
+        vm.ApplyResolvedAddress("10 rue de Rivoli, 75001 Paris");
+
+        Assert.Equal("10 rue de Rivoli, 75001 Paris", vm.Address);
+        Assert.False(vm.HasSuggestedAddress);
+    }
+
+    [Fact]
+    public void ApplyResolvedAddress_preserves_manual_address_and_exposes_suggestion()
+    {
+        var api = new RecordingApi();
+        var client = new BillingApiClient(api, "https://business.example/api/v1/");
+        var vm =
+            new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
+            .CreateCommandPageViewModel(
+                new ActivityInfo { Code = "dev", Name = "Développement" },
+                new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
+                client) as RdvViewModel;
+
+        vm!.Address = "Saisie manuelle";
+        vm.ApplyResolvedAddress("10 rue de Rivoli, 75001 Paris");
+
+        Assert.Equal("Saisie manuelle", vm.Address);
+        Assert.True(vm.HasSuggestedAddress);
+        Assert.Equal("10 rue de Rivoli, 75001 Paris", vm.SuggestedAddress);
+
+        vm.ApplySuggestedAddressCommand.Execute(null);
+
+        Assert.Equal("10 rue de Rivoli, 75001 Paris", vm.Address);
+        Assert.False(vm.HasSuggestedAddress);
+    }
+
     [Fact]
     public async Task InitializeAsync_loads_prestations_for_brush_and_submit_posts_selected_prestation()
     {
diff --git a/src/PostIt/PostIt.Tests/NominatimReverseGeocodingServiceTests.cs b/src/PostIt/PostIt.Tests/NominatimReverseGeocodingServiceTests.cs
new file mode 100644
index 000000000..4eceb7a2f
--- /dev/null
+++ b/src/PostIt/PostIt.Tests/NominatimReverseGeocodingServiceTests.cs
@@ -0,0 +1,72 @@
+using System.Net;
+using System.Text;
+using PostIt.Services;
+
+namespace PostIt.Tests;
+
+public class NominatimReverseGeocodingServiceTests
+{
+    [Fact]
+    public async Task TryResolveAddressAsync_formats_compact_street_address_from_nominatim_payload()
+    {
+        var handler = new StubHandler("""
+            {
+              "display_name": "6, Place de l'Hôtel-de-Ville - Esplanade de la Libération, Paris, 75004, France",
+              "address": {
+                "house_number": "6",
+                "road": "Place de l'Hôtel-de-Ville - Esplanade de la Libération",
+                "postcode": "75004",
+                "city": "Paris"
+              }
+            }
+            """);
+
+        var service = new NominatimReverseGeocodingService(new HttpClient(handler)
+        {
+            BaseAddress = new Uri("https://nominatim.openstreetmap.org/")
+        });
+
+        var result = await service.TryResolveAddressAsync(48.8566, 2.3522);
+
+        Assert.Equal("6, Place de l'Hôtel-de-Ville - Esplanade de la Libération, 75004, Paris", result);
+        Assert.NotNull(handler.LastRequest);
+        Assert.Contains("reverse?format=jsonv2", handler.LastRequest!.RequestUri!.ToString(), StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task TryResolveAddressAsync_returns_null_on_unsuccessful_response()
+    {
+        var handler = new StubHandler("{}", HttpStatusCode.TooManyRequests);
+        var service = new NominatimReverseGeocodingService(new HttpClient(handler)
+        {
+            BaseAddress = new Uri("https://nominatim.openstreetmap.org/")
+        });
+
+        var result = await service.TryResolveAddressAsync(48.8566, 2.3522);
+
+        Assert.Null(result);
+    }
+
+    private sealed class StubHandler : HttpMessageHandler
+    {
+        private readonly string _payload;
+        private readonly HttpStatusCode _statusCode;
+
+        public HttpRequestMessage? LastRequest { get; private set; }
+
+        public StubHandler(string payload, HttpStatusCode statusCode = HttpStatusCode.OK)
+        {
+            _payload = payload;
+            _statusCode = statusCode;
+        }
+
+        protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            LastRequest = request;
+            return Task.FromResult(new HttpResponseMessage(_statusCode)
+            {
+                Content = new StringContent(_payload, Encoding.UTF8, "application/json")
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/PostIt/PostIt.Tests/RdvPageHeadlessTests.cs b/src/PostIt/PostIt.Tests/RdvPageHeadlessTests.cs
new file mode 100644
index 000000000..fdf8689ab
--- /dev/null
+++ b/src/PostIt/PostIt.Tests/RdvPageHeadlessTests.cs
@@ -0,0 +1,79 @@
+using Avalonia.Controls;
+using Avalonia.Headless.XUnit;
+using PostIt.ViewModels;
+using PostIt.ViewModels.Commands;
+using PostIt.Views.Commands;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+
+namespace PostIt.Tests;
+
+public class RdvPageHeadlessTests
+{
+    [AvaloniaFact]
+    public void Suggested_address_panel_is_hidden_by_default()
+    {
+        var page = CreatePage(out _);
+
+        var panel = page.FindControl<Grid>("SuggestedAddressPanel");
+        var progress = page.FindControl<ProgressBar>("SuggestedAddressProgress");
+
+        Assert.NotNull(panel);
+        Assert.NotNull(progress);
+        Assert.False(panel!.IsVisible);
+        Assert.False(progress!.IsVisible);
+    }
+
+    [AvaloniaFact]
+    public async Task Suggested_address_panel_and_spinner_follow_viewmodel_state()
+    {
+        var page = CreatePage(out var vm);
+        var panel = page.FindControl<Grid>("SuggestedAddressPanel")!;
+        var progress = page.FindControl<ProgressBar>("SuggestedAddressProgress")!;
+        var applyButton = page.FindControl<Button>("ApplySuggestedAddressButton")!;
+
+        vm.Address = "Saisie manuelle";
+        vm.NotifyReverseGeocodingStarted();
+        await Task.Delay(50);
+
+        Assert.True(panel.IsVisible);
+        Assert.True(progress.IsVisible);
+        Assert.False(applyButton.IsVisible);
+
+        vm.ApplyResolvedAddress("10 rue de Rivoli, 75001 Paris");
+        await Task.Delay(50);
+
+        Assert.True(panel.IsVisible);
+        Assert.False(progress.IsVisible);
+        Assert.True(applyButton.IsVisible);
+    }
+
+    private static RdvPage CreatePage(out RdvViewModel vm)
+    {
+        vm = new RdvViewModel(
+            new ActivityInfo { Code = "dev", Name = "Développement" },
+            new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
+            new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" },
+            new BillingApiClient(new RecordingApi(), "https://business.example/api/v1/"));
+
+        var page = new RdvPage { DataContext = vm };
+        var nav = new NavigationPage();
+        _ = nav.PushAsync(page);
+        var window = new Window { Content = nav };
+        window.Show();
+        return page;
+    }
+
+    private sealed class RecordingApi : IYavscApiClient
+    {
+        public HttpClient Http { get; } = new();
+
+        public Task<T> CallAsync<T>(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+            => Task.FromResult(default(T)!);
+
+        public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+            => Task.CompletedTask;
+
+        public ValueTask DisposeAsync() => ValueTask.CompletedTask;
+    }
+}
\ No newline at end of file
diff --git a/src/PostIt/PostIt.Tests/RdvPageTests.cs b/src/PostIt/PostIt.Tests/RdvPageTests.cs
new file mode 100644
index 000000000..e9d20cc96
--- /dev/null
+++ b/src/PostIt/PostIt.Tests/RdvPageTests.cs
@@ -0,0 +1,30 @@
+using PostIt.Views.Commands;
+
+namespace PostIt.Tests;
+
+public class RdvPageTests
+{
+    [Fact]
+    public void AreCoordinatesClose_returns_true_for_nearby_points_within_cache_tolerance()
+    {
+        var result = RdvPage.AreCoordinatesClose(
+            48.8566,
+            2.3522,
+            48.85665,
+            2.35225);
+
+        Assert.True(result);
+    }
+
+    [Fact]
+    public void AreCoordinatesClose_returns_false_for_points_outside_cache_tolerance()
+    {
+        var result = RdvPage.AreCoordinatesClose(
+            48.8566,
+            2.3522,
+            48.85685,
+            2.3522);
+
+        Assert.False(result);
+    }
+}
\ No newline at end of file
diff --git a/src/PostIt/PostIt.Tests/SettingsLoadTests.cs b/src/PostIt/PostIt.Tests/SettingsLoadTests.cs
index 3f8dc02b9..069b6ac96 100644
--- a/src/PostIt/PostIt.Tests/SettingsLoadTests.cs
+++ b/src/PostIt/PostIt.Tests/SettingsLoadTests.cs
@@ -173,4 +173,51 @@ public class SettingsLoadTests
         Assert.NotNull(roundTrip);
         Assert.Equal("bonjour", roundTrip.SearchText);
     }
+
+        /// <summary>
+        /// First-start regression guard: older settings payloads can
+        /// still contain <c>ActionStatus</c> from a previous write. This
+        /// runtime-only UI state must not be persisted anymore and must
+        /// not break deserialization when present.
+        /// </summary>
+        [Fact]
+        public void ActionStatus_is_not_persisted_and_legacy_payload_with_it_still_deserializes()
+        {
+                var settings = new PostIt.ViewModels.Settings
+                {
+                        Authentication = new AuthenticationSettings
+                        {
+                                Authority = "https://example.test/",
+                                ClientId = "postit-tests",
+                                Scopes = new[] { "openid" }
+                        }
+                };
+
+                var serialized = JsonSerializer.Serialize(settings);
+                Assert.DoesNotContain("\"ActionStatus\"", serialized, StringComparison.Ordinal);
+
+                const string legacyPayload = """
+                        {
+                            "Authentication": {
+                                "Authority": "https://example.test/",
+                                "ClientId": "postit-tests",
+                                "Scopes": ["openid"],
+                                "RedirectUri": "postit://callback"
+                            },
+                            "DarkMode": false,
+                            "BlogsApiUrl": "https://blogs.example.test/api/v1/",
+                            "ApiUrl": "https://api.example.test/api/v1/",
+                            "SearchText": "hello",
+                            "ActionStatus": {
+                                "Message": "runtime only",
+                                "Severity": "Error"
+                            }
+                        }
+                        """;
+
+                var roundTrip = JsonSerializer.Deserialize<PostIt.ViewModels.Settings>(legacyPayload);
+
+                Assert.NotNull(roundTrip);
+                Assert.Equal("hello", roundTrip.SearchText);
+        }
 }
diff --git a/src/PostIt/PostIt/Controls/StatusBar.axaml b/src/PostIt/PostIt/Controls/StatusBar.axaml
new file mode 100644
index 000000000..eaa6f5a09
--- /dev/null
+++ b/src/PostIt/PostIt/Controls/StatusBar.axaml
@@ -0,0 +1,22 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:vm="using:PostIt.ViewModels"
+             x:Class="PostIt.Controls.StatusBar"
+             x:DataType="vm:StatusNotice">
+    <Border Background="{Binding Background}"
+            BorderBrush="{Binding BorderBrush}"
+            BorderThickness="1"
+            CornerRadius="6"
+            Padding="8">
+        <StackPanel Orientation="Horizontal" Spacing="8">
+            <TextBlock Text="{Binding Glyph}"
+                       FontWeight="Bold"
+                       Foreground="{Binding Foreground}"
+                       VerticalAlignment="Top"/>
+            <TextBlock Text="{Binding Message}"
+                       Foreground="{Binding Foreground}"
+                       TextWrapping="Wrap"
+                       VerticalAlignment="Center"/>
+        </StackPanel>
+    </Border>
+</UserControl>
diff --git a/src/PostIt/PostIt/Controls/StatusBar.axaml.cs b/src/PostIt/PostIt/Controls/StatusBar.axaml.cs
new file mode 100644
index 000000000..975f9b2f9
--- /dev/null
+++ b/src/PostIt/PostIt/Controls/StatusBar.axaml.cs
@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+
+namespace PostIt.Controls;
+
+public partial class StatusBar : UserControl
+{
+    public StatusBar()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs b/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs
index f95f31e30..c0831b290 100644
--- a/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs
+++ b/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs
@@ -26,10 +26,11 @@ public static class ServiceCollectionHelpers
         var userSearchClient = new UserSearchClient(api, settings.BlogsApiUrl);
         var activityClient = new ActivityApiClient(
             api,
-            settings.ApiUrl,
-            settings.Authentication?.Authority);
-        var billingClient = new BillingApiClient(api, settings.ApiUrl);
+            () => settings.ApiUrl,
+            () => settings.Authentication?.Authority);
+        var billingClient = new BillingApiClient(api, () => settings.ApiUrl);
         var userDirectory = new UserDirectory(userSearchClient);
+        var reverseGeocoding = new NominatimReverseGeocodingService();
 
         // Vues
         services.AddSingleton<MainView>();
@@ -56,6 +57,7 @@ public static class ServiceCollectionHelpers
         services.AddTransient<RdvPage>();
         services.AddTransient<BrushPage>();
         services.AddTransient<BillingQueriesPage>();
+        services.AddTransient<BillingQueryDetailsPage>();
         // ViewModels
         services.AddSingleton(settings);
         services.AddSingleton<YavscApiClient>(api);
@@ -65,6 +67,7 @@ public static class ServiceCollectionHelpers
         services.AddSingleton(userSearchClient);
         services.AddSingleton(activityClient);
         services.AddSingleton(billingClient);
+        services.AddSingleton<IReverseGeocodingService>(reverseGeocoding);
         services.AddSingleton<IUserDirectory>(userDirectory);
         services.AddSingleton<HomePageViewModel>();
         services.AddSingleton<SignaturePageViewModel>();
diff --git a/src/PostIt/PostIt/PostIt.csproj b/src/PostIt/PostIt/PostIt.csproj
index 177e346d3..09632bdf8 100644
--- a/src/PostIt/PostIt/PostIt.csproj
+++ b/src/PostIt/PostIt/PostIt.csproj
@@ -29,6 +29,8 @@
       <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
       <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="Mapsui" />
+    <PackageReference Include="Mapsui.Avalonia12" />
     <PackageReference Include="CommunityToolkit.Mvvm" />
     <PackageReference Include="IdentityModel.OidcClient" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
diff --git a/src/PostIt/PostIt/Services/IReverseGeocodingService.cs b/src/PostIt/PostIt/Services/IReverseGeocodingService.cs
new file mode 100644
index 000000000..0e62fe9dc
--- /dev/null
+++ b/src/PostIt/PostIt/Services/IReverseGeocodingService.cs
@@ -0,0 +1,9 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace PostIt.Services;
+
+public interface IReverseGeocodingService
+{
+    Task<string?> TryResolveAddressAsync(double latitude, double longitude, CancellationToken cancellationToken = default);
+}
\ No newline at end of file
diff --git a/src/PostIt/PostIt/Services/NominatimReverseGeocodingService.cs b/src/PostIt/PostIt/Services/NominatimReverseGeocodingService.cs
new file mode 100644
index 000000000..f9ddb2f6a
--- /dev/null
+++ b/src/PostIt/PostIt/Services/NominatimReverseGeocodingService.cs
@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace PostIt.Services;
+
+public sealed class NominatimReverseGeocodingService : IReverseGeocodingService
+{
+    private static readonly Uri BaseUri = new("https://nominatim.openstreetmap.org/");
+    private readonly HttpClient _httpClient;
+
+    public NominatimReverseGeocodingService(HttpClient? httpClient = null)
+    {
+        _httpClient = httpClient ?? CreateDefaultClient();
+    }
+
+    public async Task<string?> TryResolveAddressAsync(double latitude, double longitude, CancellationToken cancellationToken = default)
+    {
+        var requestUri = BuildReverseUri(latitude, longitude);
+
+        try
+        {
+            using var response = await _httpClient.GetAsync(requestUri, cancellationToken).ConfigureAwait(false);
+            if (!response.IsSuccessStatusCode)
+                return null;
+
+            await using var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
+            using var json = await JsonDocument.ParseAsync(stream, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return FormatAddress(json.RootElement);
+        }
+        catch (OperationCanceledException)
+        {
+            throw;
+        }
+        catch
+        {
+            return null;
+        }
+    }
+
+    private static HttpClient CreateDefaultClient()
+    {
+        var client = new HttpClient
+        {
+            BaseAddress = BaseUri,
+            Timeout = TimeSpan.FromSeconds(10),
+        };
+        client.DefaultRequestHeaders.UserAgent.Clear();
+        client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("PostIt", "1.1"));
+        client.DefaultRequestHeaders.AcceptLanguage.Add(new StringWithQualityHeaderValue("fr-FR"));
+        client.DefaultRequestHeaders.AcceptLanguage.Add(new StringWithQualityHeaderValue("fr", 0.9));
+        return client;
+    }
+
+    private static Uri BuildReverseUri(double latitude, double longitude)
+    {
+        var lat = latitude.ToString("0.######", CultureInfo.InvariantCulture);
+        var lon = longitude.ToString("0.######", CultureInfo.InvariantCulture);
+        var path = $"reverse?format=jsonv2&addressdetails=1&accept-language=fr&zoom=18&lat={lat}&lon={lon}";
+        return new Uri(path, UriKind.Relative);
+    }
+
+    private static string? FormatAddress(JsonElement root)
+    {
+        if (root.TryGetProperty("address", out var address))
+        {
+            var street = JoinNonEmpty(
+                TryGetString(address, "house_number"),
+                TryGetString(address, "road"));
+
+            var locality = JoinNonEmpty(
+                TryGetString(address, "postcode"),
+                TryGetString(address, "city")
+                    ?? TryGetString(address, "town")
+                    ?? TryGetString(address, "village")
+                    ?? TryGetString(address, "municipality"));
+
+            var formatted = JoinNonEmpty(street, locality);
+            if (!string.IsNullOrWhiteSpace(formatted))
+                return formatted;
+        }
+
+        if (root.TryGetProperty("display_name", out var displayName))
+        {
+            var value = displayName.GetString();
+            if (!string.IsNullOrWhiteSpace(value))
+                return value;
+        }
+
+        return null;
+    }
+
+    private static string? TryGetString(JsonElement element, string propertyName)
+    {
+        return element.TryGetProperty(propertyName, out var property)
+            ? property.GetString()
+            : null;
+    }
+
+    private static string? JoinNonEmpty(params string?[] values)
+    {
+        List<string>? parts = null;
+        foreach (var value in values)
+        {
+            if (string.IsNullOrWhiteSpace(value))
+                continue;
+
+            parts ??= new List<string>();
+            parts.Add(value.Trim());
+        }
+
+        return parts is null || parts.Count == 0 ? null : string.Join(", ", parts);
+    }
+}
\ No newline at end of file
diff --git a/src/PostIt/PostIt/ViewLocator.cs b/src/PostIt/PostIt/ViewLocator.cs
index 0055a9e60..f866e1bac 100644
--- a/src/PostIt/PostIt/ViewLocator.cs
+++ b/src/PostIt/PostIt/ViewLocator.cs
@@ -19,7 +19,7 @@ namespace PostIt;
 public class ViewLocator : IDataTemplate
 {
 
-     public Control Build(object? data)
+    public Control Build(object? data)
     {
         try
         {
@@ -49,10 +49,12 @@ public class ViewLocator : IDataTemplate
             AddCircleMemberDialogViewModel => services.GetRequiredService<AddCircleMemberDialog>(),
             CirclesPageViewModel => services.GetRequiredService<CirclesPage>(),
             PostAclDialogViewModel => services.GetRequiredService<PostAclDialog>(),
+            BillingQueriesPageViewModel => services.GetRequiredService<BillingQueriesPage>(),
+            BillingQueryDetailsPageViewModel => services.GetRequiredService<BillingQueryDetailsPage>(),
             null => new TextBlock { Text = "No view for <null>" },
             _ => new TextBlock { Text = $"No view for {data.GetType().Name}" }
         };
     }
 
-     public bool Match(object? data) => data is ViewModelBase;
+    public bool Match(object? data) => data is ViewModelBase;
 }
diff --git a/src/PostIt/PostIt/ViewModels/ActionStatusViewModelExtensions.cs b/src/PostIt/PostIt/ViewModels/ActionStatusViewModelExtensions.cs
new file mode 100644
index 000000000..614d477c8
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/ActionStatusViewModelExtensions.cs
@@ -0,0 +1,32 @@
+namespace PostIt.ViewModels;
+
+public interface IActionStatusViewModel
+{
+    string StatusMessage { get; set; }
+    StatusNotice ActionStatus { get; set; }
+}
+
+public static class ActionStatusViewModelExtensions
+{
+    public static void SetInfoStatus(this IActionStatusViewModel viewModel, string message)
+        => viewModel.SetStatus(message, StatusSeverity.Info);
+
+    public static void SetWarningStatus(this IActionStatusViewModel viewModel, string message)
+        => viewModel.SetStatus(message, StatusSeverity.Warning);
+
+    public static void SetErrorStatus(this IActionStatusViewModel viewModel, string message)
+        => viewModel.SetStatus(message, StatusSeverity.Error);
+
+    public static void SetStatus(this IActionStatusViewModel viewModel, string message, StatusSeverity severity)
+    {
+        var normalizedMessage = string.IsNullOrWhiteSpace(message) ? "Pret." : message.Trim();
+
+        viewModel.StatusMessage = normalizedMessage;
+        viewModel.ActionStatus = severity switch
+        {
+            StatusSeverity.Error => StatusNotice.Error(normalizedMessage),
+            StatusSeverity.Warning => StatusNotice.Warning(normalizedMessage),
+            _ => StatusNotice.Info(normalizedMessage),
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/PostIt/PostIt/ViewModels/ActivitiesPageViewModel.cs b/src/PostIt/PostIt/ViewModels/ActivitiesPageViewModel.cs
index 2dc8938f3..bd13faf9b 100644
--- a/src/PostIt/PostIt/ViewModels/ActivitiesPageViewModel.cs
+++ b/src/PostIt/PostIt/ViewModels/ActivitiesPageViewModel.cs
@@ -13,7 +13,7 @@ using Yavsc.Api.Client;
 
 namespace PostIt.ViewModels;
 
-public partial class ActivitiesPageViewModel : ViewModelBase
+public partial class ActivitiesPageViewModel : ViewModelBase, IActionStatusViewModel
 {
     private readonly ActivityApiClient _client;
     private readonly BillingApiClient _billingClient;
@@ -43,6 +43,9 @@ public partial class ActivitiesPageViewModel : ViewModelBase
     [ObservableProperty]
     public partial string StatusMessage { get; set; } = "Choisissez une activité.";
 
+    [ObservableProperty]
+    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Choisissez une activité.");
+
     public ActivityInfo? CurrentActivity => SelectedSpecialization ?? SelectedActivity;
     public string SelectedActivityLabel => SelectedActivity?.Name ?? "(aucune activité)";
     public string CurrentActivityLabel => CurrentActivity?.Name ?? "(aucune)";
@@ -86,11 +89,11 @@ public partial class ActivitiesPageViewModel : ViewModelBase
         }
         catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
         {
-            StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.";
+            this.SetWarningStatus("Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.");
         }
         catch (Exception ex)
         {
-            StatusMessage = $"Erreur: {ex.Message}";
+            this.SetErrorStatus($"Erreur: {ex.Message}");
         }
     }
 
@@ -102,11 +105,11 @@ public partial class ActivitiesPageViewModel : ViewModelBase
         }
         catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
         {
-            StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.";
+            this.SetWarningStatus("Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.");
         }
         catch (Exception ex)
         {
-            StatusMessage = $"Erreur: {ex.Message}";
+            this.SetErrorStatus($"Erreur: {ex.Message}");
         }
     }
 
@@ -123,7 +126,7 @@ public partial class ActivitiesPageViewModel : ViewModelBase
             await ShowActivityAsync(first);
             if (first is null)
             {
-                StatusMessage = "Aucune activité disponible.";
+                this.SetInfoStatus("Aucune activité disponible.");
             }
         }
         catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
@@ -131,14 +134,14 @@ public partial class ActivitiesPageViewModel : ViewModelBase
             Activities = new ObservableCollection<ActivityInfo>();
             Specializations = new ObservableCollection<ActivityInfo>();
             Performers = new ObservableCollection<ActivityUserDisplayItem>();
-            StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.";
+            this.SetWarningStatus("Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.");
         }
         catch (Exception ex)
         {
             Activities = new ObservableCollection<ActivityInfo>();
             Specializations = new ObservableCollection<ActivityInfo>();
             Performers = new ObservableCollection<ActivityUserDisplayItem>();
-            StatusMessage = $"Erreur: {ex.Message}";
+            this.SetErrorStatus($"Erreur: {ex.Message}");
         }
         finally
         {
@@ -230,19 +233,19 @@ public partial class ActivitiesPageViewModel : ViewModelBase
 
             Performers = new ObservableCollection<ActivityUserDisplayItem>(items);
             SelectedPerformer = null;
-            StatusMessage = $"{activity.Name} · {Performers.Count} utilisateur(s)";
+            this.SetInfoStatus($"{activity.Name} · {Performers.Count} utilisateur(s)");
         }
         catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
         {
             Performers = new ObservableCollection<ActivityUserDisplayItem>();
             SelectedPerformer = null;
-            StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.";
+            this.SetWarningStatus("Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.");
         }
         catch (Exception ex)
         {
             Performers = new ObservableCollection<ActivityUserDisplayItem>();
             SelectedPerformer = null;
-            StatusMessage = $"Erreur: {ex.Message}";
+            this.SetErrorStatus($"Erreur: {ex.Message}");
         }
         finally
         {
@@ -259,7 +262,7 @@ public partial class ActivitiesPageViewModel : ViewModelBase
     {
         if (SelectedPerformer is null || CurrentActivity is null)
         {
-            StatusMessage = "Sélectionnez un utilisateur et une activité avec formulaire.";
+            this.SetWarningStatus("Sélectionnez un utilisateur et une activité avec formulaire.");
             return;
         }
 
diff --git a/src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs b/src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs
index 88d01335a..635073d1a 100644
--- a/src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs
+++ b/src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs
@@ -29,7 +29,7 @@ namespace PostIt.ViewModels;
 /// <c>CirclesPage</c> then calls
 /// <see cref="CircleApiClient.AddMemberAsync"/>.</para>
 /// </summary>
-public partial class AddCircleMemberDialogViewModel : ViewModelBase
+public partial class AddCircleMemberDialogViewModel : ViewModelBase, IActionStatusViewModel
 {
     private readonly IUserDirectory _directory;
 
@@ -46,7 +46,10 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase
     public partial bool IsBusy { get; set; }
 
     [ObservableProperty]
-    public partial string StatusMessage { get; set; } = string.Empty;
+    public partial string StatusMessage { get; set; } = "Pret.";
+
+    [ObservableProperty]
+    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
 
     /// <summary>
     /// Raised when the user confirms a selection. The hosting
@@ -79,7 +82,7 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase
         if (string.IsNullOrWhiteSpace(SearchQuery))
         {
             Results.Clear();
-            StatusMessage = "Tapez un nom ou un email";
+            this.SetWarningStatus("Tapez un nom ou un email");
             return;
         }
 
@@ -88,11 +91,11 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase
         {
             var hits = await _directory.SearchAsync(SearchQuery, CancellationToken.None).ConfigureAwait(true);
             Results = new ObservableCollection<UserSummary>(hits ?? Array.Empty<UserSummary>());
-            StatusMessage = $"{Results.Count} résultat(s)";
+            this.SetInfoStatus($"{Results.Count} résultat(s)");
         }
         catch (Exception ex)
         {
-            StatusMessage = $"Erreur: {ex.Message}";
+            this.SetErrorStatus($"Erreur: {ex.Message}");
         }
         finally
         {
@@ -110,18 +113,20 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase
     {
         if (Selected is null)
         {
-            StatusMessage = "Sélectionnez un utilisateur";
+            this.SetWarningStatus("Sélectionnez un utilisateur");
             return;
         }
         Confirmed?.Invoke(this, Selected);
-        var app = App.Current as App;
+        var app = App.Current as App
+            ?? throw new InvalidOperationException("Application PostIt indisponible.");
         await app.GoBackAsync();
     }
 
     [RelayCommand]
     public async Task CloseAsync()
     {
-        var app = App.Current as App;
+        var app = App.Current as App
+            ?? throw new InvalidOperationException("Application PostIt indisponible.");
         await app.GoBackAsync();
     }
 }
diff --git a/src/PostIt/PostIt/ViewModels/BillingQueriesPageViewModel.cs b/src/PostIt/PostIt/ViewModels/BillingQueriesPageViewModel.cs
index d5aba0215..bccf97167 100644
--- a/src/PostIt/PostIt/ViewModels/BillingQueriesPageViewModel.cs
+++ b/src/PostIt/PostIt/ViewModels/BillingQueriesPageViewModel.cs
@@ -14,7 +14,7 @@ using Yavsc.Abstract.Workflow;
 
 namespace PostIt.ViewModels;
 
-public partial class BillingQueriesPageViewModel : ViewModelBase
+public partial class BillingQueriesPageViewModel : ViewModelBase, IActionStatusViewModel
 {
     private readonly BillingApiClient _billingClient;
 
@@ -36,11 +36,14 @@ public partial class BillingQueriesPageViewModel : ViewModelBase
     [ObservableProperty]
     public partial string StatusMessage { get; set; } = "Chargement des commandes...";
 
+    [ObservableProperty]
+    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Chargement des commandes...");
+
     public string Title => IsReadOnly
         ? $"Demandes en cours ({Form.Title})"
         : $"Commandes {Form.Title}";
     public string ContextLabel => $"{Performer.UserName} · {Activity.Name}";
-    public bool CanOpenDetails => !IsReadOnly;
+    public bool CanOpenDetails => true;
 
     public override bool CanNavigateNext
     {
@@ -72,7 +75,7 @@ public partial class BillingQueriesPageViewModel : ViewModelBase
 
     public Task InitializeAsync() => RefreshAsync();
 
-    private bool CanOpenSelectedQuery() => !IsReadOnly && SelectedQuery is not null;
+    private bool CanOpenSelectedQuery() => SelectedQuery is not null;
 
     [RelayCommand]
     public async Task RefreshAsync()
@@ -90,17 +93,17 @@ public partial class BillingQueriesPageViewModel : ViewModelBase
                 .ToList();
 
             Queries = new ObservableCollection<BillingQueryDisplayItem>(filtered);
-            StatusMessage = BuildLoadedStatusMessage(filtered.Count);
+            this.SetInfoStatus(BuildLoadedStatusMessage(filtered.Count));
         }
         catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
         {
             Queries = new ObservableCollection<BillingQueryDisplayItem>();
-            StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.";
+            this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.");
         }
         catch (Exception ex)
         {
             Queries = new ObservableCollection<BillingQueryDisplayItem>();
-            StatusMessage = $"Erreur: {ex.Message}";
+            this.SetErrorStatus($"Erreur: {ex.Message}");
         }
         finally
         {
@@ -111,15 +114,9 @@ public partial class BillingQueriesPageViewModel : ViewModelBase
     [RelayCommand(CanExecute = nameof(CanOpenSelectedQuery))]
     public async Task OpenSelectedQueryAsync()
     {
-        if (IsReadOnly)
-        {
-            StatusMessage = "Mode lecture seule: l'ouverture en modification est désactivée.";
-            return;
-        }
-
         if (SelectedQuery is null)
         {
-            StatusMessage = "Sélectionnez une commande.";
+            this.SetWarningStatus("Sélectionnez une commande.");
             return;
         }
 
@@ -133,17 +130,22 @@ public partial class BillingQueriesPageViewModel : ViewModelBase
         try
         {
             var details = await _billingClient.GetQueryAsync(Form.ActionName, SelectedQuery.Id).ConfigureAwait(true);
-            var vm = Form.CreateCommandPageViewModel(Activity, Performer, _billingClient);
-            await vm!.InitializeAsync(details).ConfigureAwait(true);
+            var vm = new BillingQueryDetailsPageViewModel(
+                Activity,
+                Performer,
+                Form,
+                _billingClient,
+                details,
+                IsReadOnly);
             await app.PushPageAsync(vm).ConfigureAwait(true);
         }
         catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
         {
-            StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.";
+            this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.");
         }
         catch (Exception ex)
         {
-            StatusMessage = $"Erreur lors de l'ouverture: {ex.Message}";
+            this.SetErrorStatus($"Erreur lors de l'ouverture: {ex.Message}");
         }
         finally
         {
diff --git a/src/PostIt/PostIt/ViewModels/BillingQueryDetailsPageViewModel.cs b/src/PostIt/PostIt/ViewModels/BillingQueryDetailsPageViewModel.cs
new file mode 100644
index 000000000..cd13daaf1
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/BillingQueryDetailsPageViewModel.cs
@@ -0,0 +1,208 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using PostIt.Helpers;
+using Yavsc;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+
+namespace PostIt.ViewModels;
+
+public partial class BillingQueryDetailsPageViewModel : ViewModelBase, IActionStatusViewModel
+{
+    private readonly BillingApiClient _billingClient;
+    private readonly BillingQueryDetailsDto _details;
+
+    public ActivityInfo Activity { get; }
+    public ActivityUserDisplayItem Performer { get; }
+    public CommandFormSummary Form { get; }
+    public bool IsReadOnly { get; }
+
+    public long Id => _details.Id;
+    public string Title => $"Detail commande #{_details.Id}";
+    public string ContextLabel => $"{Performer.UserName} · {Activity.Name} · {Form.Title}";
+    public string StatusLabel => _details.Status.ToString();
+    public string StatusGlyph => GetStatusGlyph(_details.Status);
+    public string StatusBadgeBackground => GetStatusBadgeBackground(_details.Status);
+    public string StatusBadgeBorder => GetStatusBadgeBorder(_details.Status);
+    public string StatusBadgeForeground => GetStatusBadgeForeground(_details.Status);
+    public string TitleForeground => StatusBadgeForeground;
+    public string BillingCode => _details.BillingCode;
+    public string Description => EmptyAsPlaceholder(_details.Description, "(sans description)");
+    public string Reason => EmptyAsPlaceholder(_details.Reason, "(aucun motif)");
+    public string AdditionalInfo => EmptyAsPlaceholder(_details.AdditionalInfo, "(aucune info complementaire)");
+    public string ClientId => EmptyAsPlaceholder(_details.ClientId, "(non renseigne)");
+    public string EventDateLabel => _details.EventDate?.ToLocalTime().ToString("f") ?? "Date non precisee";
+    public string ConsentLabel => _details.Consent ? "Oui" : "Non";
+    public string ProvisionalLabel => _details.Provisional.HasValue ? _details.Provisional.Value.ToString("0.00") : "(non renseigne)";
+    public string LocationLabel => BuildLocationLabel(_details.Location);
+    public string PrestationsLabel => BuildPrestationsLabel(_details);
+    public bool CanEdit => !IsReadOnly;
+
+    [ObservableProperty]
+    public partial bool IsBusy { get; set; }
+
+    [ObservableProperty]
+    public partial string StatusMessage { get; set; } = "Pret.";
+
+    [ObservableProperty]
+    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
+
+    public override bool CanNavigateNext
+    {
+        get => false;
+        protected set { _ = value; }
+    }
+
+    public override bool CanNavigatePrevious
+    {
+        get => true;
+        protected set { _ = value; }
+    }
+
+    public BillingQueryDetailsPageViewModel(
+        ActivityInfo activity,
+        ActivityUserDisplayItem performer,
+        CommandFormSummary form,
+        BillingApiClient billingClient,
+        BillingQueryDetailsDto details,
+        bool isReadOnly)
+    {
+        Activity = activity ?? throw new ArgumentNullException(nameof(activity));
+        Performer = performer ?? throw new ArgumentNullException(nameof(performer));
+        Form = form ?? throw new ArgumentNullException(nameof(form));
+        _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
+        _details = details ?? throw new ArgumentNullException(nameof(details));
+        IsReadOnly = isReadOnly;
+
+        this.SetInfoStatus("Details de commande charges.");
+    }
+
+    [RelayCommand]
+    private async Task OpenEditorAsync()
+    {
+        if (IsReadOnly)
+        {
+            this.SetWarningStatus("Mode lecture seule: edition desactivee.");
+            return;
+        }
+
+        var app = (App?)Application.Current;
+        if (app is null)
+        {
+            throw new InvalidOperationException("Application PostIt indisponible.");
+        }
+
+        IsBusy = true;
+        try
+        {
+            var vm = Form.CreateCommandPageViewModel(Activity, Performer, _billingClient);
+            if (vm is null)
+            {
+                this.SetWarningStatus("Ce formulaire n'est pas encore pris en charge en edition.");
+                return;
+            }
+
+            await vm.InitializeAsync(_details).ConfigureAwait(true);
+            await app.PushPageAsync(vm).ConfigureAwait(true);
+        }
+        catch (Exception ex)
+        {
+            this.SetErrorStatus($"Erreur lors de l'ouverture en edition: {ex.Message}");
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    [RelayCommand]
+    private async Task BackAsync()
+    {
+        var app = (App?)Application.Current;
+        if (app is null)
+        {
+            throw new InvalidOperationException("Application PostIt indisponible.");
+        }
+
+        await app.GoBackAsync().ConfigureAwait(true);
+    }
+
+    private static string EmptyAsPlaceholder(string? value, string placeholder)
+        => string.IsNullOrWhiteSpace(value) ? placeholder : value;
+
+    private static string BuildLocationLabel(BillingLocationDto? location)
+    {
+        if (location is null)
+        {
+            return "(non renseignee)";
+        }
+
+        var text = EmptyAsPlaceholder(location.Address, "adresse vide");
+        if (location.Latitude.HasValue && location.Longitude.HasValue)
+        {
+            text += $" ({location.Latitude.Value:0.####}, {location.Longitude.Value:0.####})";
+        }
+
+        return text;
+    }
+
+    private static string BuildPrestationsLabel(BillingQueryDetailsDto details)
+    {
+        if (details.PrestationIds.Count > 0)
+        {
+            return string.Join(", ", details.PrestationIds.Select(static id => id.ToString()));
+        }
+
+        return details.PrestationId.HasValue
+            ? details.PrestationId.Value.ToString()
+            : "(aucune)";
+    }
+
+    private static string GetStatusBadgeBackground(QueryStatus status)
+        => status switch
+        {
+            QueryStatus.Accepted => "#E6F7EC",
+            QueryStatus.InProgress => "#FFF4D6",
+            QueryStatus.Rejected => "#FDECEA",
+            QueryStatus.Failed => "#ECEFF1",
+            QueryStatus.Success => "#E8F8EF",
+            _ => "#EAF3FF",
+        };
+
+    private static string GetStatusBadgeBorder(QueryStatus status)
+        => status switch
+        {
+            QueryStatus.Accepted => "#2E7D32",
+            QueryStatus.InProgress => "#B26A00",
+            QueryStatus.Rejected => "#C62828",
+            QueryStatus.Failed => "#607D8B",
+            QueryStatus.Success => "#1E8E3E",
+            _ => "#2A5EA8",
+        };
+
+    private static string GetStatusBadgeForeground(QueryStatus status)
+        => status switch
+        {
+            QueryStatus.Accepted => "#1B5E20",
+            QueryStatus.InProgress => "#7A4A00",
+            QueryStatus.Rejected => "#8E0000",
+            QueryStatus.Failed => "#37474F",
+            QueryStatus.Success => "#145A2A",
+            _ => "#1A4178",
+        };
+
+    private static string GetStatusGlyph(QueryStatus status)
+        => status switch
+        {
+            QueryStatus.Accepted => "OK",
+            QueryStatus.InProgress => "~",
+            QueryStatus.Rejected => "!",
+            QueryStatus.Failed => "X",
+            QueryStatus.Success => "V",
+            _ => "i",
+        };
+}
\ No newline at end of file
diff --git a/src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs b/src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs
index 9cee3ea8c..cd068b4f4 100644
--- a/src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs
+++ b/src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs
@@ -34,7 +34,7 @@ namespace PostIt.ViewModels;
 /// <see cref="OnAddMemberConfirmedAsync"/>. The "remove"
 /// command is per-row and runs inline.</para>
 /// </summary>
-public partial class CirclesPageViewModel : ViewModelBase
+public partial class CirclesPageViewModel : ViewModelBase, IActionStatusViewModel
 {
     private readonly CircleApiClient _client;
 
@@ -63,8 +63,10 @@ public partial class CirclesPageViewModel : ViewModelBase
     public partial bool IsBusy { get; set; }
 
     [ObservableProperty]
-    public partial string StatusMessage { get; set; } = string.Empty;
+    public partial string StatusMessage { get; set; } = "Pret.";
 
+    [ObservableProperty]
+    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
 
     public CirclesPageViewModel(CircleApiClient client)
     {
@@ -100,11 +102,11 @@ public partial class CirclesPageViewModel : ViewModelBase
         {
             var list = await _client.GetMyCirclesAsync();
             Circles = new ObservableCollection<CircleDto>(list ?? new());
-            StatusMessage = $"{Circles.Count} cercle(s)";
+            this.SetInfoStatus($"{Circles.Count} cercle(s)");
         }
         catch (Exception ex)
         {
-            StatusMessage = $"Erreur: {ex.Message}";
+            this.SetErrorStatus($"Erreur: {ex.Message}");
         }
         finally
         {
@@ -115,8 +117,10 @@ public partial class CirclesPageViewModel : ViewModelBase
     [RelayCommand]
     internal async Task OpenAddMemberAsync()
     {
-        var app = Application.Current as App;
-        var services = app?.ServiceProvider;
+        var app = Application.Current as App
+            ?? throw new InvalidOperationException("Application PostIt indisponible.");
+        var services = app.ServiceProvider
+            ?? throw new InvalidOperationException("ServiceProvider PostIt indisponible.");
         var directory = services.GetRequiredService<IUserDirectory>();
         AddCircleMemberDialogViewModel model =
         new AddCircleMemberDialogViewModel(directory);
@@ -147,11 +151,11 @@ public partial class CirclesPageViewModel : ViewModelBase
         {
             var list = await _client.GetMembersAsync(circleId);
             Members = new ObservableCollection<CircleMemberDto>(list ?? new());
-            StatusMessage = $"{Members.Count} membre(s)";
+            this.SetInfoStatus($"{Members.Count} membre(s)");
         }
         catch (Exception ex)
         {
-            StatusMessage = $"Erreur: {ex.Message}";
+            this.SetErrorStatus($"Erreur: {ex.Message}");
             Members = new ObservableCollection<CircleMemberDto>();
         }
         finally
@@ -166,7 +170,7 @@ public partial class CirclesPageViewModel : ViewModelBase
         SelectedCircle = null;
         DraftName = string.Empty;
         DraftPublic = false;
-        StatusMessage = "Nouveau cercle";
+        this.SetInfoStatus("Nouveau cercle");
     }
 
     [RelayCommand]
@@ -176,7 +180,7 @@ public partial class CirclesPageViewModel : ViewModelBase
         SelectedCircle = circle;
         DraftName = circle.Name;
         DraftPublic = circle.Public;
-        StatusMessage = $"Édition de « {circle.Name} »";
+        this.SetInfoStatus($"Édition de « {circle.Name} »");
     }
 
     [RelayCommand]
@@ -184,7 +188,7 @@ public partial class CirclesPageViewModel : ViewModelBase
     {
         if (string.IsNullOrWhiteSpace(DraftName))
         {
-            StatusMessage = "Le nom est obligatoire";
+            this.SetWarningStatus("Le nom est obligatoire");
             return;
         }
 
@@ -198,22 +202,22 @@ public partial class CirclesPageViewModel : ViewModelBase
                     Name = DraftName.Trim(),
                     Public = DraftPublic,
                 });
-                StatusMessage = created is null
-                    ? "Création échouée"
-                    : $"Cercle « {created.Name} » créé";
+                this.SetStatus(
+                    created is null ? "Création échouée" : $"Cercle « {created.Name} » créé",
+                    created is null ? StatusSeverity.Warning : StatusSeverity.Info);
             }
             else
             {
                 SelectedCircle.Name = DraftName.Trim();
                 SelectedCircle.Public = DraftPublic;
                 await _client.UpdateCircleAsync(SelectedCircle.Id, SelectedCircle);
-                StatusMessage = $"Cercle « {SelectedCircle.Name} » mis à jour";
+                this.SetInfoStatus($"Cercle « {SelectedCircle.Name} » mis à jour");
             }
             await RefreshAsync();
         }
         catch (Exception ex)
         {
-            StatusMessage = $"Erreur: {ex.Message}";
+            this.SetErrorStatus($"Erreur: {ex.Message}");
         }
         finally
         {
@@ -229,7 +233,7 @@ public partial class CirclesPageViewModel : ViewModelBase
         try
         {
             await _client.DeleteCircleAsync(circle.Id);
-            StatusMessage = $"Cercle « {circle.Name} » supprimé";
+            this.SetInfoStatus($"Cercle « {circle.Name} » supprimé");
             // If the deleted circle was the selected one,
             // clear the selection so the Members view goes
             // empty too (the partial setter on
@@ -240,7 +244,7 @@ public partial class CirclesPageViewModel : ViewModelBase
         }
         catch (Exception ex)
         {
-            StatusMessage = $"Erreur: {ex.Message}";
+            this.SetErrorStatus($"Erreur: {ex.Message}");
         }
         finally
         {
@@ -261,7 +265,7 @@ public partial class CirclesPageViewModel : ViewModelBase
         try
         {
             await _client.AddMemberAsync(SelectedCircle.Id, picked.Id);
-            StatusMessage = $"« {picked.DisplayName} » ajouté au cercle";
+            this.SetInfoStatus($"« {picked.DisplayName} » ajouté au cercle");
             await LoadMembersAsync(SelectedCircle.Id);
         }
         catch (Exception ex)
@@ -276,7 +280,7 @@ public partial class CirclesPageViewModel : ViewModelBase
             var msg = ex.Message.Contains("409") || ex.Message.Contains("Conflict")
                 ? "Déjà membre du cercle"
                 : $"Erreur: {ex.Message}";
-            StatusMessage = msg;
+            this.SetStatus(msg, msg == "Déjà membre du cercle" ? StatusSeverity.Warning : StatusSeverity.Error);
         }
         finally
         {
@@ -297,11 +301,11 @@ public partial class CirclesPageViewModel : ViewModelBase
         {
             await _client.RemoveMemberAsync(SelectedCircle.Id, member.Id);
             Members.Remove(member);
-            StatusMessage = $"« {member.UserName} » retiré du cercle";
+            this.SetInfoStatus($"« {member.UserName} » retiré du cercle");
         }
         catch (Exception ex)
         {
-            StatusMessage = $"Erreur: {ex.Message}";
+            this.SetErrorStatus($"Erreur: {ex.Message}");
         }
         finally
         {
diff --git a/src/PostIt/PostIt/ViewModels/CommandFormsPageViewModel.cs b/src/PostIt/PostIt/ViewModels/CommandFormsPageViewModel.cs
index 71f5d67a0..533fbc380 100644
--- a/src/PostIt/PostIt/ViewModels/CommandFormsPageViewModel.cs
+++ b/src/PostIt/PostIt/ViewModels/CommandFormsPageViewModel.cs
@@ -11,7 +11,7 @@ using Yavsc.Api.Client;
 
 namespace PostIt.ViewModels;
 
-public partial class CommandFormsPageViewModel : ViewModelBase
+public partial class CommandFormsPageViewModel : ViewModelBase, IActionStatusViewModel
 {
     private readonly BillingApiClient _billingClient;
 
@@ -25,7 +25,10 @@ public partial class CommandFormsPageViewModel : ViewModelBase
     public partial CommandFormSummary? SelectedForm { get; set; }
 
     [ObservableProperty]
-    public partial string StatusMessage { get; set; }
+    public partial string StatusMessage { get; set; } = "Pret.";
+
+    [ObservableProperty]
+    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
 
     public string Title => $"Formulaires pour {Performer.UserName}";
     public string ContextLabel => $"{Activity.Name} · {Forms.Count} formulaire(s)";
@@ -55,9 +58,11 @@ public partial class CommandFormsPageViewModel : ViewModelBase
             .OrderBy(f => f.Title)
             .ThenBy(f => f.ActionName));
         SelectedForm = Forms.FirstOrDefault();
-        StatusMessage = Forms.Count == 0
-            ? "Aucun formulaire n'est disponible pour cette activité."
-            : "Choisissez le formulaire à utiliser.";
+        this.SetStatus(
+            Forms.Count == 0
+                ? "Aucun formulaire n'est disponible pour cette activité."
+                : "Choisissez le formulaire à utiliser.",
+            Forms.Count == 0 ? StatusSeverity.Warning : StatusSeverity.Info);
     }
 
     private bool CanOpenSelectedForm() => SelectedForm is not null;
@@ -71,7 +76,7 @@ public partial class CommandFormsPageViewModel : ViewModelBase
     {
         if (SelectedForm is null)
         {
-            StatusMessage = "Sélectionnez un formulaire.";
+            this.SetWarningStatus("Sélectionnez un formulaire.");
             return;
         }
 
@@ -92,7 +97,7 @@ public partial class CommandFormsPageViewModel : ViewModelBase
     {
         if (SelectedForm is null)
         {
-            StatusMessage = "Sélectionnez un formulaire.";
+            this.SetWarningStatus("Sélectionnez un formulaire.");
             return;
         }
 
@@ -112,7 +117,7 @@ public partial class CommandFormsPageViewModel : ViewModelBase
     {
         if (SelectedForm is null)
         {
-            StatusMessage = "Sélectionnez un formulaire.";
+            this.SetWarningStatus("Sélectionnez un formulaire.");
             return;
         }
 
diff --git a/src/PostIt/PostIt/ViewModels/Commands/BillingCommandPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Commands/BillingCommandPageViewModel.cs
index 0ab76291d..5ad2b08f4 100644
--- a/src/PostIt/PostIt/ViewModels/Commands/BillingCommandPageViewModel.cs
+++ b/src/PostIt/PostIt/ViewModels/Commands/BillingCommandPageViewModel.cs
@@ -9,7 +9,7 @@ using Yavsc.Models.Billing;
 
 namespace PostIt.ViewModels;
 
-public abstract partial class BillingCommandPageViewModel : RemoteViewModelBase
+public abstract partial class BillingCommandPageViewModel : RemoteViewModelBase, IActionStatusViewModel
 {
     protected readonly BillingApiClient _billingClient;
 
@@ -21,7 +21,10 @@ public abstract partial class BillingCommandPageViewModel : RemoteViewModelBase
     public partial bool IsBusy { get; set; }
 
     [ObservableProperty]
-    public partial string StatusMessage { get; set; }
+    public partial string StatusMessage { get; set; } = "Pret.";
+
+    [ObservableProperty]
+    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
 
     [ObservableProperty]
     public partial string Reason { get; set; } = string.Empty;
@@ -75,7 +78,7 @@ public abstract partial class BillingCommandPageViewModel : RemoteViewModelBase
         Form = form ?? throw new ArgumentNullException(nameof(form));
         _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
 
-        StatusMessage = SupportMessage;
+        this.SetInfoStatus(SupportMessage);
     }
 
     partial void OnExistingQueryIdChanged(long? value)
diff --git a/src/PostIt/PostIt/ViewModels/Commands/BrushViewModel.cs b/src/PostIt/PostIt/ViewModels/Commands/BrushViewModel.cs
index d49fde803..72d9ce8ea 100644
--- a/src/PostIt/PostIt/ViewModels/Commands/BrushViewModel.cs
+++ b/src/PostIt/PostIt/ViewModels/Commands/BrushViewModel.cs
@@ -58,18 +58,20 @@ public partial class BrushViewModel : RdvViewModel
                 SelectedPrestation = AvailablePrestations.FirstOrDefault();
             }
 
-            StatusMessage = AvailablePrestations.Count == 0
-                ? "Aucune prestation coiffure disponible."
-                : SupportMessage;
+            this.SetStatus(
+                AvailablePrestations.Count == 0
+                    ? "Aucune prestation coiffure disponible."
+                    : SupportMessage,
+                AvailablePrestations.Count == 0 ? StatusSeverity.Warning : StatusSeverity.Info);
         }
         catch (HttpRequestException ex)
         when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
         {
-            StatusMessage = "Accès refusé au catalogue de prestations (scope 'api'). Déconnectez puis reconnectez-vous.";
+            this.SetWarningStatus("Accès refusé au catalogue de prestations (scope 'api'). Déconnectez puis reconnectez-vous.");
         }
         catch (Exception ex)
         {
-            StatusMessage = $"Erreur lors du chargement des prestations: {ex.Message}";
+            this.SetErrorStatus($"Erreur lors du chargement des prestations: {ex.Message}");
         }
         finally
         {
@@ -81,19 +83,19 @@ public partial class BrushViewModel : RdvViewModel
     {
         if (!Consent)
         {
-            StatusMessage = "Le consentement est requis pour poster la commande.";
+            this.SetWarningStatus("Le consentement est requis pour poster la commande.");
             return;
         }
 
         if (string.IsNullOrWhiteSpace(Address))
         {
-            StatusMessage = "L'adresse du rendez-vous est requise.";
+            this.SetWarningStatus("L'adresse du rendez-vous est requise.");
             return;
         }
 
         if (SelectedPrestation is null)
         {
-            StatusMessage = "Sélectionnez une prestation coiffure.";
+            this.SetWarningStatus("Sélectionnez une prestation coiffure.");
             return;
         }
 
@@ -143,18 +145,18 @@ public partial class BrushViewModel : RdvViewModel
                 }).ConfigureAwait(true);
             }
 
-            StatusMessage = IsEditingExisting
+            this.SetInfoStatus(IsEditingExisting
                 ? $"Commande #{ExistingQueryId} mise à jour sur {BillingRoute} pour {Performer.UserName}."
-                : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}.";
+                : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}.");
         }
         catch (HttpRequestException ex)
         when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
         {
-            StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.";
+            this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.");
         }
         catch (Exception ex)
         {
-            StatusMessage = $"Erreur lors de l'envoi de la commande: {ex.Message}";
+            this.SetErrorStatus($"Erreur lors de l'envoi de la commande: {ex.Message}");
         }
         finally
         {
diff --git a/src/PostIt/PostIt/ViewModels/Commands/MBrushViewModel.cs b/src/PostIt/PostIt/ViewModels/Commands/MBrushViewModel.cs
index 793a77516..05481c2c3 100644
--- a/src/PostIt/PostIt/ViewModels/Commands/MBrushViewModel.cs
+++ b/src/PostIt/PostIt/ViewModels/Commands/MBrushViewModel.cs
@@ -49,20 +49,20 @@ public partial class MBrushViewModel : BrushViewModel
     {
         if (!Consent)
         {
-            StatusMessage = "Le consentement est requis pour poster la commande.";
+            this.SetWarningStatus("Le consentement est requis pour poster la commande.");
             return;
         }
 
         if (string.IsNullOrWhiteSpace(Address))
         {
-            StatusMessage = "L'adresse du rendez-vous est requise.";
+            this.SetWarningStatus("L'adresse du rendez-vous est requise.");
             return;
         }
 
         var selectedPrestations = MultiPrestations.Where(x => x.IsSelected).ToList();
         if (selectedPrestations.Count == 0)
         {
-            StatusMessage = "Sélectionnez au moins une prestation coiffure.";
+            this.SetWarningStatus("Sélectionnez au moins une prestation coiffure.");
             return;
         }
 
@@ -109,18 +109,18 @@ public partial class MBrushViewModel : BrushViewModel
                 }).ConfigureAwait(true);
             }
 
-            StatusMessage = IsEditingExisting
+            this.SetInfoStatus(IsEditingExisting
                 ? $"Commande #{ExistingQueryId} mise à jour sur {BillingRoute} pour {Performer.UserName}."
-                : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}.";
+                : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}.");
         }
         catch (HttpRequestException ex)
             when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
         {
-            StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.";
+            this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.");
         }
         catch (Exception ex)
         {
-            StatusMessage = $"Erreur lors de l'envoi de la commande: {ex.Message}";
+            this.SetErrorStatus($"Erreur lors de l'envoi de la commande: {ex.Message}");
         }
         finally
         {
diff --git a/src/PostIt/PostIt/ViewModels/Commands/RdvViewModel.cs b/src/PostIt/PostIt/ViewModels/Commands/RdvViewModel.cs
index c2ff3294e..7a7d17df6 100644
--- a/src/PostIt/PostIt/ViewModels/Commands/RdvViewModel.cs
+++ b/src/PostIt/PostIt/ViewModels/Commands/RdvViewModel.cs
@@ -17,6 +17,12 @@ public partial class RdvViewModel : BillingCommandPageViewModel
     [ObservableProperty]
     public partial string Address { get; set; } = string.Empty;
 
+    [ObservableProperty]
+    public partial string SuggestedAddress { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial bool IsResolvingAddress { get; set; }
+
     [ObservableProperty]
     public partial double? Latitude { get; set; }
 
@@ -27,12 +33,27 @@ public partial class RdvViewModel : BillingCommandPageViewModel
     [ObservableProperty]
     public partial DateTime EventDate { get; set; }
 
+    public DateTimeOffset? EventDateSelection
+    {
+        get => new(EventDate);
+        set
+        {
+            if (!value.HasValue)
+                return;
+
+            EventDate = value.Value.LocalDateTime;
+        }
+    }
+
     public RdvViewModel(ActivityInfo activity, ActivityUserDisplayItem performer, CommandFormSummary form, BillingApiClient billingClient)
         : base(activity, performer, form, billingClient)
     {
         EventDate = DateTime.Now.AddDays(1);
     }
 
+    public bool HasSuggestedAddress => !string.IsNullOrWhiteSpace(SuggestedAddress);
+    public bool HasSuggestedAddressPanel => HasSuggestedAddress || IsResolvingAddress;
+
     protected override void ApplyExistingQuery(BillingQueryDetailsDto existingQuery)
     {
         ExistingQueryId = existingQuery.Id;
@@ -50,11 +71,12 @@ public partial class RdvViewModel : BillingCommandPageViewModel
         if (existingQuery.Location is not null)
         {
             Address = existingQuery.Location.Address ?? string.Empty;
+            SuggestedAddress = string.Empty;
             Latitude = existingQuery.Location.Latitude;
             Longitude = existingQuery.Location.Longitude;
         }
 
-        StatusMessage = $"Commande #{existingQuery.Id} chargée.";
+        this.SetInfoStatus($"Commande #{existingQuery.Id} chargée.");
     }
 
     [RelayCommand(CanExecute = nameof(CanUseCurrentLocation))]
@@ -71,23 +93,23 @@ public partial class RdvViewModel : BillingCommandPageViewModel
             var result = await Platform.TryGetCurrentLocationAsync(default).ConfigureAwait(true);
             if (!result.IsSuccess || !result.Latitude.HasValue || !result.Longitude.HasValue)
             {
-                StatusMessage = result.Message;
+                this.SetWarningStatus(result.Message);
                 return;
             }
 
             Latitude = result.Latitude.Value;
             Longitude = result.Longitude.Value;
-            StatusMessage = string.IsNullOrWhiteSpace(Address)
+            this.SetInfoStatus(string.IsNullOrWhiteSpace(Address)
                 ? "Position récupérée. Complétez l'adresse puis envoyez la commande."
-                : result.Message;
+                : result.Message);
         }
         catch (OperationCanceledException)
         {
-            StatusMessage = "La récupération de la position a été annulée.";
+            this.SetWarningStatus("La récupération de la position a été annulée.");
         }
         catch (Exception ex)
         {
-            StatusMessage = $"Impossible de récupérer la position: {ex.Message}";
+            this.SetErrorStatus($"Impossible de récupérer la position: {ex.Message}");
         }
         finally
         {
@@ -113,31 +135,119 @@ public partial class RdvViewModel : BillingCommandPageViewModel
         };
     }
 
+    public void ApplyLocationFromMap(double latitude, double longitude)
+    {
+        Latitude = Math.Round(latitude, 6);
+        Longitude = Math.Round(longitude, 6);
+
+        if (string.IsNullOrWhiteSpace(Address))
+        {
+            this.SetInfoStatus("Position sélectionnée sur la carte. Complétez l'adresse puis envoyez la commande.");
+            return;
+        }
+
+        this.SetInfoStatus("Position sélectionnée sur la carte.");
+    }
+
+    public void NotifyReverseGeocodingStarted()
+    {
+        IsResolvingAddress = true;
+        this.SetInfoStatus(string.IsNullOrWhiteSpace(Address)
+            ? "Recherche de l'adresse depuis la carte..."
+            : "Recherche d'une adresse suggérée..."
+        );
+    }
+
+    public void NotifyReverseGeocodingUnavailable()
+    {
+        IsResolvingAddress = false;
+        if (HasSuggestedAddress || !string.IsNullOrWhiteSpace(Address))
+            return;
+
+        this.SetInfoStatus("Position sélectionnée sur la carte. Complétez l'adresse puis envoyez la commande.");
+    }
+
+    public void ApplyResolvedAddress(string address)
+    {
+        if (string.IsNullOrWhiteSpace(address))
+            return;
+
+        var trimmedAddress = address.Trim();
+        if (string.IsNullOrWhiteSpace(Address))
+        {
+            Address = trimmedAddress;
+            SuggestedAddress = string.Empty;
+            IsResolvingAddress = false;
+            this.SetInfoStatus("Adresse mise à jour depuis la carte.");
+            return;
+        }
+
+        if (string.Equals(Address.Trim(), trimmedAddress, StringComparison.Ordinal))
+        {
+            SuggestedAddress = string.Empty;
+            IsResolvingAddress = false;
+            return;
+        }
+
+        SuggestedAddress = trimmedAddress;
+        IsResolvingAddress = false;
+        this.SetInfoStatus("Adresse suggérée depuis la carte. Appliquez-la si besoin.");
+    }
+
+    [RelayCommand(CanExecute = nameof(HasSuggestedAddress))]
+    private void ApplySuggestedAddress()
+    {
+        if (string.IsNullOrWhiteSpace(SuggestedAddress))
+            return;
+
+        Address = SuggestedAddress.Trim();
+        SuggestedAddress = string.Empty;
+        IsResolvingAddress = false;
+        this.SetInfoStatus("Adresse suggérée appliquée.");
+    }
+
+    partial void OnSuggestedAddressChanged(string value)
+    {
+        OnPropertyChanged(nameof(HasSuggestedAddress));
+        OnPropertyChanged(nameof(HasSuggestedAddressPanel));
+        ApplySuggestedAddressCommand.NotifyCanExecuteChanged();
+    }
+
+    partial void OnIsResolvingAddressChanged(bool value)
+    {
+        OnPropertyChanged(nameof(HasSuggestedAddressPanel));
+    }
+
+    partial void OnEventDateChanged(DateTime value)
+    {
+        OnPropertyChanged(nameof(EventDateSelection));
+    }
+
 
     protected override async Task SubmitAsync()
     {
         if (!IsSupported)
         {
-            StatusMessage = SupportMessage;
+            this.SetWarningStatus(SupportMessage);
             return;
         }
 
         if (!Consent)
         {
-            StatusMessage = "Le consentement est requis pour poster la commande.";
+            this.SetWarningStatus("Le consentement est requis pour poster la commande.");
             return;
         }
 
         if (string.IsNullOrWhiteSpace(Address))
         {
-            StatusMessage = "L'adresse du rendez-vous est requise.";
+            this.SetWarningStatus("L'adresse du rendez-vous est requise.");
             return;
         }
 
 
         if (string.IsNullOrWhiteSpace(Reason))
         {
-            StatusMessage = "Le motif du rendez-vous est requis.";
+            this.SetWarningStatus("Le motif du rendez-vous est requis.");
             return;
         }
 
@@ -186,17 +296,17 @@ public partial class RdvViewModel : BillingCommandPageViewModel
                 }).ConfigureAwait(true);
             }
 
-            StatusMessage = IsEditingExisting
+            this.SetInfoStatus(IsEditingExisting
                 ? $"Commande #{ExistingQueryId} mise à jour sur {BillingRoute} pour {Performer.UserName}."
-                : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}.";
+                : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}.");
         }
         catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
         {
-            StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.";
+            this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.");
         }
         catch (Exception ex)
         {
-            StatusMessage = $"Erreur lors de l'envoi: {ex.Message}";
+            this.SetErrorStatus($"Erreur lors de l'envoi: {ex.Message}");
         }
         finally
         {
diff --git a/src/PostIt/PostIt/ViewModels/MainViewModel.cs b/src/PostIt/PostIt/ViewModels/MainViewModel.cs
index f56b666dd..d2667c012 100644
--- a/src/PostIt/PostIt/ViewModels/MainViewModel.cs
+++ b/src/PostIt/PostIt/ViewModels/MainViewModel.cs
@@ -12,7 +12,7 @@ using PostIt.Helpers;
 
 namespace PostIt.ViewModels;
 
-public partial class MainViewModel : ViewModelBase
+public partial class MainViewModel : ViewModelBase, IActionStatusViewModel
 {
     /// <summary>Window/tab title. Cosmetic — bound by
     /// <c>MainPage.axaml</c> if at all. Not the post title.</summary>
@@ -54,6 +54,9 @@ public partial class MainViewModel : ViewModelBase
     [ObservableProperty]
     public partial string StatusMessage { get; set; }
 
+    [ObservableProperty]
+    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
+
     [ObservableProperty]
     public partial string SearchText { get; set; }
 
@@ -84,7 +87,7 @@ public partial class MainViewModel : ViewModelBase
                 Posts.Add(post);
             }
             ApplyFilter();
-            StatusMessage = $"Loaded {Posts.Count} posts.";
+            this.SetInfoStatus($"{Posts.Count} billet(s) chargé(s).");
         });
     }
 
@@ -104,7 +107,7 @@ public partial class MainViewModel : ViewModelBase
         // than to send a request the server will reject.
         if (string.IsNullOrWhiteSpace(DraftTitle))
         {
-            StatusMessage = "Title is required.";
+            this.SetWarningStatus("Le titre est obligatoire.");
             return;
         }
 
@@ -134,7 +137,7 @@ public partial class MainViewModel : ViewModelBase
                 if (created is not null)
                 {
                     SelectedPost = created;
-                    StatusMessage = $"Created post {created.Id}.";
+                    this.SetInfoStatus($"Billet {created.Id} créé.");
                 }
             }
             else
@@ -150,7 +153,7 @@ public partial class MainViewModel : ViewModelBase
                     DateModified = DateTime.UtcNow,
                 };
                 await BlogClient!.UpdatePostAsync(SelectedPost.Id, update);
-                StatusMessage = $"Saved post {SelectedPost.Id}.";
+                this.SetInfoStatus($"Billet {SelectedPost.Id} enregistré.");
             }
 
             await RefreshPostsAsync();
@@ -162,14 +165,14 @@ public partial class MainViewModel : ViewModelBase
     {
         if (SelectedPost is null || SelectedPost.Id == 0)
         {
-            StatusMessage = "Select an existing post before deleting.";
+            this.SetWarningStatus("Sélectionnez un billet existant avant suppression.");
             return;
         }
 
         await ExecuteAsync(async () =>
         {
             await BlogClient!.DeletePostAsync(SelectedPost.Id);
-            StatusMessage = $"Deleted post {SelectedPost.Id}.";
+            this.SetInfoStatus($"Billet {SelectedPost.Id} supprimé.");
             SelectedPost = null;
             await RefreshPostsAsync();
         });
@@ -194,7 +197,7 @@ public partial class MainViewModel : ViewModelBase
     {
         if (SelectedPost is null || SelectedPost.Id == 0)
         {
-            StatusMessage = "Sélectionnez un billet existant pour changer sa publication.";
+            this.SetWarningStatus("Sélectionnez un billet existant pour changer sa publication.");
             return;
         }
 
@@ -211,9 +214,9 @@ public partial class MainViewModel : ViewModelBase
             // locally flipped state until the round-trip
             // re-hydrates it.
             SelectedPost.IsPublished = publish;
-            StatusMessage = publish
+            this.SetInfoStatus(publish
                 ? $"Billet {SelectedPost.Id} publié."
-                : $"Billet {SelectedPost.Id} remis en brouillon.";
+                : $"Billet {SelectedPost.Id} remis en brouillon.");
         });
     }
 
@@ -247,7 +250,7 @@ public partial class MainViewModel : ViewModelBase
     {
         if (SelectedPost is null)
         {
-            StatusMessage = "Select an existing post before managing ACL.";
+            this.SetWarningStatus("Sélectionnez un billet existant avant de gérer l'ACL.");
             return;
         }
 
@@ -346,7 +349,7 @@ public partial class MainViewModel : ViewModelBase
         FilteredPosts = new ObservableCollection<BlogPostDto>();
         SelectedPost = null;
         IsBusy = false;
-        StatusMessage = "Ready";
+        this.SetInfoStatus("Prêt.");
         Settings = settings ?? new Settings();
         SearchText = Settings.SearchText;
         WindowTitle = "PostIt";
@@ -476,12 +479,12 @@ public partial class MainViewModel : ViewModelBase
         try
         {
             IsBusy = true;
-            StatusMessage = "Working...";
+            this.SetInfoStatus("Traitement en cours...");
             await action();
         }
         catch (Exception ex)
         {
-            StatusMessage = $"Error: {ex.Message}";
+            this.SetErrorStatus($"Erreur: {ex.Message}");
         }
         finally
         {
diff --git a/src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs b/src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs
index 605446068..be1b220fa 100644
--- a/src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs
+++ b/src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs
@@ -37,7 +37,7 @@ public sealed class PostAclEntry
 /// any 403 / 404 will surface as an exception caught by the
 /// command and routed to <see cref="StatusMessage"/>.</para>
 /// </summary>
-public partial class PostAclDialogViewModel : ViewModelBase
+public partial class PostAclDialogViewModel : ViewModelBase, IActionStatusViewModel
 {
     private readonly BlogAclApiClient _aclClient;
     private readonly CircleApiClient _circleClient;
@@ -61,7 +61,10 @@ public partial class PostAclDialogViewModel : ViewModelBase
     public partial bool IsBusy { get; set; }
 
     [ObservableProperty]
-    public partial string StatusMessage { get; set; } = string.Empty;
+    public partial string StatusMessage { get; set; } = "Pret.";
+
+    [ObservableProperty]
+    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
 
     /// <summary>
     /// Idempotency gate for <see cref="LoadAsync"/>: the dialog
@@ -115,12 +118,12 @@ public partial class PostAclDialogViewModel : ViewModelBase
             AclEntries = new ObservableCollection<PostAclEntry>(AclEntries.Select(a => ToAclEntry(a.CircleId)));
 
 
-            StatusMessage = $"{AclEntries.Count} autorisation(s)";
+            this.SetInfoStatus($"{AclEntries.Count} autorisation(s)");
             _loaded = true;
         }
         catch (Exception ex)
         {
-            StatusMessage = $"Erreur: {ex.Message}";
+            this.SetErrorStatus($"Erreur: {ex.Message}");
         }
         finally
         {
@@ -133,7 +136,7 @@ public partial class PostAclDialogViewModel : ViewModelBase
     {
         if (SelectedCircleToAdd is null)
         {
-            StatusMessage = "Sélectionnez un cercle à ajouter";
+            this.SetWarningStatus("Sélectionnez un cercle à ajouter");
             return;
         }
 
@@ -142,7 +145,7 @@ public partial class PostAclDialogViewModel : ViewModelBase
         {
             if (AclEntries.Any(a => a.CircleId == SelectedCircleToAdd.Id))
             {
-                StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé";
+                this.SetWarningStatus($"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé");
                 return;
             }
 
@@ -154,11 +157,11 @@ public partial class PostAclDialogViewModel : ViewModelBase
             if (created is not null)
             {
                 AclEntries.Add(ToAclEntry(created.CircleId));
-                StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » autorisé";
+                this.SetInfoStatus($"Cercle « {SelectedCircleToAdd.Name} » autorisé");
             }
             else
             {
-                StatusMessage = "Autorisation refusée par le serveur";
+                this.SetWarningStatus("Autorisation refusée par le serveur");
             }
         }
         catch (HttpRequestException ex) when (ex.StatusCode == HttpStatusCode.Conflict)
@@ -166,11 +169,11 @@ public partial class PostAclDialogViewModel : ViewModelBase
             // Conflict means the link already exists in backend. Resync
             // from the dedicated ACL API so the UI reflects server truth.
             await ReloadAclEntriesFromServerAsync();
-            StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé";
+            this.SetWarningStatus($"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé");
         }
         catch (Exception ex)
         {
-            StatusMessage = $"Erreur: {ex.Message}";
+            this.SetErrorStatus($"Erreur: {ex.Message}");
         }
         finally
         {
@@ -189,11 +192,11 @@ public partial class PostAclDialogViewModel : ViewModelBase
             var existing = AclEntries.FirstOrDefault(e => e.CircleId == acl.CircleId);
             if (existing is not null)
                 AclEntries.Remove(existing);
-            StatusMessage = "Autorisation révoquée";
+            this.SetInfoStatus("Autorisation révoquée");
         }
         catch (Exception ex)
         {
-            StatusMessage = $"Erreur: {ex.Message}";
+            this.SetErrorStatus($"Erreur: {ex.Message}");
         }
         finally
         {
diff --git a/src/PostIt/PostIt/ViewModels/Settings/Settings.cs b/src/PostIt/PostIt/ViewModels/Settings/Settings.cs
index e63f0b321..0864c1416 100644
--- a/src/PostIt/PostIt/ViewModels/Settings/Settings.cs
+++ b/src/PostIt/PostIt/ViewModels/Settings/Settings.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Net.Http;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 
 [assembly: InternalsVisibleTo("PostIt.Tests")]
 
@@ -31,6 +32,20 @@ public partial class Settings : ViewModelBase
     [ObservableProperty]
     public partial string SearchText { get; set; } = string.Empty;
 
+    [ObservableProperty]
+    [JsonIgnore]
+    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
+
+    public void SetActionStatus(string message, StatusSeverity severity = StatusSeverity.Info)
+    {
+        ActionStatus = severity switch
+        {
+            StatusSeverity.Error => StatusNotice.Error(message),
+            StatusSeverity.Warning => StatusNotice.Warning(message),
+            _ => StatusNotice.Info(message),
+        };
+    }
+
     /// <summary>
     /// Catch top-level mutations: the four ObservableProperty
     /// setters above all funnel through here, and we flip
@@ -110,6 +125,8 @@ public partial class Settings : ViewModelBase
         // build options from a torn read.
         lock (_mutationGate)
         {
+            EnsureAuthenticationDefaultsLocked();
+
             var options = new OidcClientOptions
             {
                 Authority = Authentication.Authority,
@@ -138,6 +155,25 @@ public partial class Settings : ViewModelBase
         }
     }
 
+    private void EnsureAuthenticationDefaultsLocked()
+    {
+        Authentication ??= new AuthenticationSettings();
+
+        if (string.IsNullOrWhiteSpace(Authentication.Authority))
+            Authentication.Authority = AuthenticationSettings.DefaultAuthority;
+
+        if (string.IsNullOrWhiteSpace(Authentication.ClientId))
+            Authentication.ClientId = AuthenticationSettings.DefaultClientId;
+
+        if (string.IsNullOrWhiteSpace(Authentication.RedirectUri))
+            Authentication.RedirectUri = AuthenticationSettings.DesktopRedirectUri;
+
+        if (Authentication.Scopes is null || Authentication.Scopes.Length == 0)
+            Authentication.Scopes = AuthenticationSettings.DefaultScopes;
+
+        Authentication.RefreshScopeListText();
+    }
+
     /// <summary>
     /// Scopes the PostIt client always requires from the OIDC provider,
     /// regardless of what the user has in their settings file.
@@ -321,11 +357,13 @@ public partial class Settings : ViewModelBase
                      AuthenticationSettings.DesktopRedirectUri : settings.Authentication.RedirectUri;
                     if (settings.Authentication.Scopes is null || settings.Authentication.Scopes.Length == 0)
                     {
-                        settings.Authentication.Scopes = AuthenticationSettings.DefaultScopes;
+                        this.Authentication.Scopes = AuthenticationSettings.DefaultScopes;
                     }
                     else
                         this.Authentication.Scopes = settings.Authentication.Scopes;
                 }
+
+                EnsureAuthenticationDefaultsLocked();
             }
             // A disk load (or an embedded-resource fallback) is the
             // baseline, not a user edit. Clear the dirty flag last
@@ -406,6 +444,8 @@ public partial class Settings : ViewModelBase
     [RelayCommand(CanExecute = nameof(CanSave))]
     public void Save()
     {
+        SetActionStatus("Enregistrement des parametres...", StatusSeverity.Info);
+
         var configDir = Path.Combine(
             Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
             "PostIt");
@@ -425,10 +465,13 @@ public partial class Settings : ViewModelBase
                     File.SetUnixFileMode(configPath,
                         UnixFileMode.UserRead | UnixFileMode.UserWrite);
                 IsDirty = false;
+                SetActionStatus("Parametres sauvegardes.", StatusSeverity.Info);
+                
                 Console.WriteLine($"💾 Settings saved to {configPath}");
             }
             catch (Exception ex)
             {
+                SetActionStatus($"Echec sauvegarde parametres: {ex.Message}", StatusSeverity.Error);
                 Console.Error.WriteLine($"🩎 Error saving settings to {configPath}: {ex.Message}");
                 throw;
             }
diff --git a/src/PostIt/PostIt/ViewModels/SignaturePageViewModel.cs b/src/PostIt/PostIt/ViewModels/SignaturePageViewModel.cs
index b4b37974b..23ba70cf9 100644
--- a/src/PostIt/PostIt/ViewModels/SignaturePageViewModel.cs
+++ b/src/PostIt/PostIt/ViewModels/SignaturePageViewModel.cs
@@ -30,7 +30,7 @@ namespace PostIt.ViewModels;
 /// until the Yavsc.Org endpoint exists; the contract there will
 /// be <c>POST /api/signature/{devisId}</c> with this same payload.
 /// </summary>
-public partial class SignaturePageViewModel : ViewModelBase
+public partial class SignaturePageViewModel : ViewModelBase, IActionStatusViewModel
 {
     /// <summary>
     /// Default capture surface, in DIPs. 3:1 ratio matches a
@@ -42,6 +42,9 @@ public partial class SignaturePageViewModel : ViewModelBase
     [ObservableProperty]
     public partial string StatusMessage { get; set; } = "Prêt.";
 
+    [ObservableProperty]
+    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Prêt.");
+
     [ObservableProperty]
     public partial int StrokeCount { get; set; }
 
@@ -107,7 +110,7 @@ public partial class SignaturePageViewModel : ViewModelBase
 
     private void OnStrokeCompleted(object? sender, SignaturePadData data)
     {
-        StatusMessage = $"Trait terminé. {data.StrokeCount} trait(s).";
+        this.SetInfoStatus($"Trait terminé. {data.StrokeCount} trait(s).");
         RefreshCounts();
     }
 
@@ -125,7 +128,7 @@ public partial class SignaturePageViewModel : ViewModelBase
     public void Clear()
     {
         _control?.Clear();
-        StatusMessage = "Effacé.";
+        this.SetInfoStatus("Effacé.");
         RefreshCounts();
     }
 
@@ -134,14 +137,14 @@ public partial class SignaturePageViewModel : ViewModelBase
     {
         if (_control is null)
         {
-            StatusMessage = "Contrôle non attaché.";
+            this.SetWarningStatus("Contrôle non attaché.");
             return;
         }
 
         var data = _control.Snapshot();
         if (data.IsEmpty)
         {
-            StatusMessage = "Rien à capturer.";
+            this.SetWarningStatus("Rien à capturer.");
             return;
         }
 
@@ -149,11 +152,11 @@ public partial class SignaturePageViewModel : ViewModelBase
         {
             var path = WriteCapture(data);
             LastCapturedPath = path;
-            StatusMessage = $"Capture enregistrée: {path}";
+            this.SetInfoStatus($"Capture enregistrée: {path}");
         }
         catch (Exception ex)
         {
-            StatusMessage = $"Erreur: {ex.Message}";
+            this.SetErrorStatus($"Erreur: {ex.Message}");
         }
         await Task.CompletedTask;
     }
diff --git a/src/PostIt/PostIt/ViewModels/StatusNotice.cs b/src/PostIt/PostIt/ViewModels/StatusNotice.cs
new file mode 100644
index 000000000..972c64350
--- /dev/null
+++ b/src/PostIt/PostIt/ViewModels/StatusNotice.cs
@@ -0,0 +1,35 @@
+namespace PostIt.ViewModels;
+
+public enum StatusSeverity
+{
+    Info,
+    Warning,
+    Error
+}
+
+public sealed class StatusNotice
+{
+    public string Message { get; }
+    public StatusSeverity Severity { get; }
+    public string Glyph { get; }
+    public string Background { get; }
+    public string BorderBrush { get; }
+    public string Foreground { get; }
+
+    private StatusNotice(string message, StatusSeverity severity)
+    {
+        Message = string.IsNullOrWhiteSpace(message) ? "Pret." : message;
+        Severity = severity;
+
+        (Glyph, Background, BorderBrush, Foreground) = severity switch
+        {
+            StatusSeverity.Error => ("!", "#FDECEA", "#C62828", "#7F1D1D"),
+            StatusSeverity.Warning => ("~", "#FFF8E1", "#E6A700", "#7C4A03"),
+            _ => ("i", "#E8F0FE", "#5B8DEF", "#1E3A8A"),
+        };
+    }
+
+    public static StatusNotice Info(string message) => new(message, StatusSeverity.Info);
+    public static StatusNotice Warning(string message) => new(message, StatusSeverity.Warning);
+    public static StatusNotice Error(string message) => new(message, StatusSeverity.Error);
+}
diff --git a/src/PostIt/PostIt/Views/ActivitiesPage.axaml b/src/PostIt/PostIt/Views/ActivitiesPage.axaml
index 16d883443..a34d8edf2 100644
--- a/src/PostIt/PostIt/Views/ActivitiesPage.axaml
+++ b/src/PostIt/PostIt/Views/ActivitiesPage.axaml
@@ -1,6 +1,7 @@
 <ContentPage xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:PostIt.ViewModels"
+             xmlns:postitControls="using:PostIt.Controls"
              xmlns:wf="using:Yavsc.Abstract.Workflow"
              x:Class="PostIt.Views.ActivitiesPage"
              x:DataType="vm:ActivitiesPageViewModel"
@@ -131,16 +132,8 @@
         </Grid>
 
         <Grid Grid.Row="2" ColumnDefinitions="*,Auto">
-            <TextBox Grid.Column="0"
-                     Text="{Binding StatusMessage}"
-                     IsReadOnly="True"
-                     AcceptsReturn="True"
-                     TextWrapping="Wrap"
-                     BorderThickness="0"
-                     BorderBrush="Transparent"
-                     Padding="0"
-                     Background="Transparent"
-                     VerticalAlignment="Center" />
+            <postitControls:StatusBar Grid.Column="0"
+                                      DataContext="{Binding ActionStatus}" />
             <ProgressBar Grid.Column="1" Width="120" IsIndeterminate="True" IsVisible="{Binding IsBusy}" />
         </Grid>
     </Grid>
diff --git a/src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml b/src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml
index 8b2329886..a17f8574e 100644
--- a/src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml
+++ b/src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml
@@ -3,6 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="PostIt.Views.AddCircleMemberDialog"
         xmlns:vm="using:PostIt.ViewModels"
+    xmlns:postitControls="using:PostIt.Controls"
         xmlns:services="using:PostIt.Services"
         x:DataType="vm:AddCircleMemberDialogViewModel"
       >
@@ -47,8 +48,8 @@
 
         <!-- Action buttons -->
         <Grid Grid.Row="3" ColumnDefinitions="*,Auto,Auto" Margin="0,8,0,0">
-            <TextBlock Grid.Column="0" Text="{Binding StatusMessage}"
-                       VerticalAlignment="Center"/>
+            <postitControls:StatusBar Grid.Column="0"
+                                      DataContext="{Binding ActionStatus}" />
             <Button Grid.Column="1" Content="Ajouter"
                     x:Name="AddButton"
                     Command="{Binding AddAsync}"
diff --git a/src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml.cs b/src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml.cs
index 2941c5576..0fdb15c09 100644
--- a/src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml.cs
+++ b/src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml.cs
@@ -1,10 +1,8 @@
 
 using Avalonia.Markup.Xaml;
-using Avalonia.Interactivity;
 using Avalonia.VisualTree;
 using PostIt.Services;
 using PostIt.ViewModels;
-using System.Threading.Tasks;
 
 namespace PostIt.Views;
 
@@ -41,10 +39,4 @@ public partial class AddCircleMemberDialog : Avalonia.Controls.ContentPage
     /// </summary>
     public AddCircleMemberDialogViewModel? ViewModel
         => DataContext as AddCircleMemberDialogViewModel;
-
-    private async Task OnCloseClicked(object? sender, RoutedEventArgs e)
-    {
-        App app = App.Current! as App;
-        await app!.GoBackAsync();
-    }
 }
diff --git a/src/PostIt/PostIt/Views/BillingQueriesPage.axaml b/src/PostIt/PostIt/Views/BillingQueriesPage.axaml
index c4b333e42..52b255129 100644
--- a/src/PostIt/PostIt/Views/BillingQueriesPage.axaml
+++ b/src/PostIt/PostIt/Views/BillingQueriesPage.axaml
@@ -1,51 +1,89 @@
 <ContentPage xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:PostIt.ViewModels"
+             xmlns:postitControls="using:PostIt.Controls"
              x:Class="PostIt.Views.BillingQueriesPage"
              x:DataType="vm:BillingQueriesPageViewModel"
              Header="Commandes billing">
-    <Grid RowDefinitions="Auto,Auto,*,Auto" Margin="12">
-        <StackPanel Grid.Row="0" Spacing="2">
-            <TextBlock Text="{Binding Title}" FontSize="18" FontWeight="Bold" />
+    <Grid RowDefinitions="Auto,Auto,Auto,*,Auto" Margin="12">
+        <StackPanel Grid.Row="0" Spacing="3">
+            <TextBlock Text="{Binding Title}" FontSize="20" FontWeight="Bold" />
             <TextBlock Text="{Binding ContextLabel}" Opacity="0.75" />
         </StackPanel>
 
-        <StackPanel Grid.Row="1" Orientation="Horizontal" Spacing="8" Margin="0,12,0,12">
-            <Button Content="Rafraîchir" Command="{Binding RefreshCommand}" />
-            <Button Content="Ouvrir la commande"
+        <Grid Grid.Row="1" Margin="0,10,0,0" ColumnDefinitions="Auto,8,Auto,8,*">
+            <Border Grid.Column="0" Background="#EAF3FF" BorderBrush="#2A5EA8" BorderThickness="1" CornerRadius="6" Padding="8,3">
+                <TextBlock Text="{Binding IsReadOnly, StringFormat='Lecture seule : {0}'}" FontSize="11" />
+            </Border>
+            <Border Grid.Column="2" Background="#F2F7F2" BorderBrush="#2F6D2F" BorderThickness="1" CornerRadius="6" Padding="8,3">
+                <TextBlock Text="{Binding OngoingOnly, StringFormat='En cours uniquement : {0}'}" FontSize="11" />
+            </Border>
+            <TextBlock Grid.Column="4"
+                       HorizontalAlignment="Right"
+                       VerticalAlignment="Center"
+                       Text="{Binding Queries.Count, StringFormat='Résultats : {0}'}"
+                       Opacity="0.7" />
+        </Grid>
+
+        <Grid Grid.Row="2" ColumnDefinitions="Auto,8,Auto,*" Margin="0,12,0,12">
+            <Button Grid.Column="0" Content="Rafraîchir" Command="{Binding RefreshCommand}" />
+            <Button Content="Voir le detail"
+                    Grid.Column="2"
                     Command="{Binding OpenSelectedQueryCommand}"
                     IsVisible="{Binding CanOpenDetails}" />
-        </StackPanel>
+        </Grid>
 
-        <ListBox Grid.Row="2" ItemsSource="{Binding Queries}" SelectedItem="{Binding SelectedQuery, Mode=TwoWay}">
+        <ListBox Grid.Row="3"
+                 ItemsSource="{Binding Queries}"
+                 SelectedItem="{Binding SelectedQuery, Mode=TwoWay}">
             <ListBox.ItemTemplate>
                 <DataTemplate x:DataType="vm:BillingQueryDisplayItem">
-                    <Border BorderThickness="0,0,0,1" BorderBrush="#22000000" Padding="0,0,0,10" Margin="0,0,0,10">
-                        <StackPanel Spacing="3">
-                            <TextBlock Text="{Binding Description}" FontWeight="Bold" />
-                            <TextBlock Text="{Binding Summary}" TextWrapping="Wrap" FontSize="12" Opacity="0.8" />
-                            <StackPanel Orientation="Horizontal" Spacing="8">
-                                <TextBlock Text="{Binding EventDateLabel}" FontSize="11" Opacity="0.7" />
-                                <TextBlock Text="{Binding StatusLabel}" FontSize="11" Opacity="0.7" />
-                                <TextBlock Text="{Binding BillingCode}" FontSize="11" Opacity="0.6" />
-                            </StackPanel>
-                        </StackPanel>
+                    <Border BorderThickness="1"
+                            BorderBrush="#22000000"
+                            CornerRadius="8"
+                            Padding="10"
+                            Margin="0,0,0,8">
+                        <Grid RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="*,Auto">
+                            <TextBlock Grid.Row="0"
+                                       Grid.Column="0"
+                                       Text="{Binding Description}"
+                                       FontWeight="Bold"
+                                       TextWrapping="Wrap" />
+                            <TextBlock Grid.Row="0"
+                                       Grid.Column="1"
+                                       Text="{Binding StatusLabel}"
+                                       FontSize="11"
+                                       Opacity="0.75"
+                                       HorizontalAlignment="Right" />
+
+                            <TextBlock Grid.Row="1"
+                                       Grid.ColumnSpan="2"
+                                       Margin="0,4,0,0"
+                                       Text="{Binding Summary}"
+                                       TextWrapping="Wrap"
+                                       FontSize="12"
+                                       Opacity="0.85" />
+
+                            <Grid Grid.Row="2" Grid.ColumnSpan="2" ColumnDefinitions="*,Auto" Margin="0,8,0,0">
+                                <TextBlock Grid.Column="0"
+                                           Text="{Binding EventDateLabel, StringFormat='Date : {0}'}"
+                                           FontSize="11"
+                                           Opacity="0.7" />
+                                <TextBlock Grid.Column="1"
+                                           Text="{Binding BillingCode, StringFormat='Code : {0}'}"
+                                           FontSize="11"
+                                           Opacity="0.65"
+                                           HorizontalAlignment="Right" />
+                            </Grid>
+                        </Grid>
                     </Border>
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
 
-        <Grid Grid.Row="3" ColumnDefinitions="*,Auto" Margin="0,12,0,0">
-            <TextBox Grid.Column="0"
-                     Text="{Binding StatusMessage}"
-                     IsReadOnly="True"
-                     AcceptsReturn="True"
-                     TextWrapping="Wrap"
-                     BorderThickness="0"
-                     BorderBrush="Transparent"
-                     Padding="0"
-                     Background="Transparent"
-                     VerticalAlignment="Center" />
+        <Grid Grid.Row="4" ColumnDefinitions="*,Auto" Margin="0,12,0,0">
+            <postitControls:StatusBar Grid.Column="0"
+                                      DataContext="{Binding ActionStatus}" />
             <ProgressBar Grid.Column="1" Width="120" IsIndeterminate="True" IsVisible="{Binding IsBusy}" />
         </Grid>
     </Grid>
diff --git a/src/PostIt/PostIt/Views/BillingQueryDetailsPage.axaml b/src/PostIt/PostIt/Views/BillingQueryDetailsPage.axaml
new file mode 100644
index 000000000..82231ad83
--- /dev/null
+++ b/src/PostIt/PostIt/Views/BillingQueryDetailsPage.axaml
@@ -0,0 +1,131 @@
+<ContentPage xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:vm="using:PostIt.ViewModels"
+             xmlns:postitControls="using:PostIt.Controls"
+             x:Class="PostIt.Views.BillingQueryDetailsPage"
+             x:DataType="vm:BillingQueryDetailsPageViewModel"
+             Header="Detail commande">
+    <Grid RowDefinitions="Auto,Auto,*,Auto" Margin="12">
+        <StackPanel Grid.Row="0" Spacing="4">
+            <TextBlock Text="{Binding Title}"
+                       FontSize="20"
+                       FontWeight="Bold"
+                       Foreground="{Binding TitleForeground}" />
+            <TextBlock Text="{Binding ContextLabel}" Opacity="0.75" />
+        </StackPanel>
+
+        <Grid Grid.Row="1" Margin="0,10,0,0" ColumnDefinitions="Auto,8,Auto,*">
+            <Button Grid.Column="0"
+                    Content="Retour"
+                    Command="{Binding BackCommand}" />
+            <Button Grid.Column="2"
+                    Content="Ouvrir en edition"
+                    Command="{Binding OpenEditorCommand}"
+                    IsVisible="{Binding CanEdit}" />
+        </Grid>
+
+        <ScrollViewer Grid.Row="2" Margin="0,12,0,12">
+            <StackPanel Spacing="10">
+                <Border BorderThickness="1"
+                        BorderBrush="#22000000"
+                        CornerRadius="8"
+                        Padding="10">
+                    <Grid ColumnDefinitions="Auto,12,*" RowDefinitions="Auto,Auto" RowSpacing="8">
+                        <TextBlock Grid.Row="0" Grid.Column="0" Text="Statut" FontWeight="SemiBold" />
+                        <Border Grid.Row="0"
+                                Grid.Column="2"
+                                Background="{Binding StatusBadgeBackground}"
+                                BorderBrush="{Binding StatusBadgeBorder}"
+                                BorderThickness="1"
+                                CornerRadius="6"
+                                Padding="8,3"
+                                HorizontalAlignment="Left">
+                            <StackPanel Orientation="Horizontal" Spacing="6">
+                                <TextBlock Text="{Binding StatusGlyph}"
+                                           Foreground="{Binding StatusBadgeForeground}"
+                                           FontWeight="Bold" />
+                                <TextBlock Text="{Binding StatusLabel}"
+                                           Foreground="{Binding StatusBadgeForeground}"
+                                           FontWeight="SemiBold" />
+                            </StackPanel>
+                        </Border>
+
+                        <TextBlock Grid.Row="1" Grid.Column="0" Text="Date" FontWeight="SemiBold" />
+                        <TextBlock Grid.Row="1" Grid.Column="2" Text="{Binding EventDateLabel}" />
+                    </Grid>
+                </Border>
+
+                <Border BorderThickness="1"
+                        BorderBrush="#22000000"
+                        CornerRadius="8"
+                        Padding="10">
+                    <Grid ColumnDefinitions="Auto,12,*" RowDefinitions="Auto,Auto,Auto,Auto" RowSpacing="8">
+                        <TextBlock Grid.Row="0" Grid.Column="0" Text="Description" FontWeight="SemiBold" />
+                        <TextBlock Grid.Row="0" Grid.Column="2" Text="{Binding Description}" TextWrapping="Wrap" />
+
+                        <TextBlock Grid.Row="1" Grid.Column="0" Text="Motif" FontWeight="SemiBold" />
+                        <TextBlock Grid.Row="1" Grid.Column="2" Text="{Binding Reason}" TextWrapping="Wrap" />
+
+                        <TextBlock Grid.Row="2" Grid.Column="0" Text="Infos" FontWeight="SemiBold" />
+                        <TextBlock Grid.Row="2" Grid.Column="2" Text="{Binding AdditionalInfo}" TextWrapping="Wrap" />
+
+                        <TextBlock Grid.Row="3" Grid.Column="0" Text="Consentement" FontWeight="SemiBold" />
+                        <TextBlock Grid.Row="3" Grid.Column="2" Text="{Binding ConsentLabel}" />
+                    </Grid>
+                </Border>
+
+                <Expander Header="Metadonnees techniques"
+                          IsExpanded="False">
+                    <Border BorderThickness="1"
+                            BorderBrush="#22000000"
+                            CornerRadius="8"
+                            Padding="10"
+                            Margin="0,6,0,0">
+                        <Grid ColumnDefinitions="Auto,12,*" RowDefinitions="Auto,Auto,Auto,Auto,Auto" RowSpacing="8">
+                            <TextBlock Grid.Row="0" Grid.Column="0" Text="Code" FontWeight="SemiBold" />
+                            <TextBlock Grid.Row="0"
+                                       Grid.Column="2"
+                                       Text="{Binding BillingCode}"
+                                       FontFamily="Consolas, Courier New, monospace" />
+
+                            <TextBlock Grid.Row="1" Grid.Column="0" Text="Client" FontWeight="SemiBold" />
+                            <TextBlock Grid.Row="1"
+                                       Grid.Column="2"
+                                       Text="{Binding ClientId}"
+                                       FontFamily="Consolas, Courier New, monospace" />
+
+                            <TextBlock Grid.Row="2" Grid.Column="0" Text="Provision" FontWeight="SemiBold" />
+                            <TextBlock Grid.Row="2"
+                                       Grid.Column="2"
+                                       Text="{Binding ProvisionalLabel}"
+                                       FontFamily="Consolas, Courier New, monospace" />
+
+                            <TextBlock Grid.Row="3" Grid.Column="0" Text="Lieu" FontWeight="SemiBold" />
+                            <TextBlock Grid.Row="3"
+                                       Grid.Column="2"
+                                       Text="{Binding LocationLabel}"
+                                       TextWrapping="Wrap"
+                                       FontFamily="Consolas, Courier New, monospace" />
+
+                            <TextBlock Grid.Row="4" Grid.Column="0" Text="Prestations" FontWeight="SemiBold" />
+                            <TextBlock Grid.Row="4"
+                                       Grid.Column="2"
+                                       Text="{Binding PrestationsLabel}"
+                                       TextWrapping="Wrap"
+                                       FontFamily="Consolas, Courier New, monospace" />
+                        </Grid>
+                    </Border>
+                </Expander>
+            </StackPanel>
+        </ScrollViewer>
+
+        <Grid Grid.Row="3" ColumnDefinitions="*,Auto" Margin="0,8,0,0">
+            <postitControls:StatusBar Grid.Column="0"
+                                      DataContext="{Binding ActionStatus}" />
+            <ProgressBar Grid.Column="1"
+                         Width="120"
+                         IsIndeterminate="True"
+                         IsVisible="{Binding IsBusy}" />
+        </Grid>
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/src/PostIt/PostIt/Views/BillingQueryDetailsPage.axaml.cs b/src/PostIt/PostIt/Views/BillingQueryDetailsPage.axaml.cs
new file mode 100644
index 000000000..ed5336ee0
--- /dev/null
+++ b/src/PostIt/PostIt/Views/BillingQueryDetailsPage.axaml.cs
@@ -0,0 +1,17 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace PostIt.Views;
+
+public partial class BillingQueryDetailsPage : ContentPage
+{
+    public BillingQueryDetailsPage()
+    {
+        InitializeComponent();
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}
diff --git a/src/PostIt/PostIt/Views/CirclesPage.axaml b/src/PostIt/PostIt/Views/CirclesPage.axaml
index 6fc2172ba..8488201e2 100644
--- a/src/PostIt/PostIt/Views/CirclesPage.axaml
+++ b/src/PostIt/PostIt/Views/CirclesPage.axaml
@@ -1,6 +1,7 @@
 <ContentPage
         xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:postitControls="using:PostIt.Controls"
         x:Class="PostIt.Views.CirclesPage"
         xmlns:vm="using:PostIt.ViewModels"
         xmlns:dtos="using:Yavsc.Api.Client.Dtos"
@@ -101,8 +102,8 @@
 
         <!-- Status bar -->
         <Grid Grid.Row="2" ColumnDefinitions="*,Auto" Margin="12,0,12,12">
-            <TextBlock Grid.Column="0" Text="{Binding StatusMessage}"
-                       VerticalAlignment="Center"/>
+            <postitControls:StatusBar Grid.Column="0"
+                                      DataContext="{Binding ActionStatus}" />
             <ProgressBar Grid.Column="1" IsIndeterminate="True"
                          IsVisible="{Binding IsBusy}"
                          Width="120"/>
diff --git a/src/PostIt/PostIt/Views/CommandFormsPage.axaml b/src/PostIt/PostIt/Views/CommandFormsPage.axaml
index 8fad010ef..f44c098bd 100644
--- a/src/PostIt/PostIt/Views/CommandFormsPage.axaml
+++ b/src/PostIt/PostIt/Views/CommandFormsPage.axaml
@@ -1,6 +1,7 @@
 <ContentPage xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:PostIt.ViewModels"
+             xmlns:postitControls="using:PostIt.Controls"
              xmlns:wf="using:Yavsc.Abstract.Workflow"
              x:Class="PostIt.Views.CommandFormsPage"
              x:DataType="vm:CommandFormsPageViewModel"
@@ -41,16 +42,8 @@
             <Button Grid.Column="4"
                     Content="Demandes en cours (lecture seule)"
                     Command="{Binding OpenOngoingQueriesCommand}" />
-            <TextBox Grid.Column="6"
-                     Text="{Binding StatusMessage}"
-                     IsReadOnly="True"
-                     AcceptsReturn="True"
-                     TextWrapping="Wrap"
-                     BorderThickness="0"
-                     BorderBrush="Transparent"
-                     Padding="0"
-                     Background="Transparent"
-                     VerticalAlignment="Center" />
+            <postitControls:StatusBar Grid.Column="6"
+                                      DataContext="{Binding ActionStatus}" />
         </Grid>
     </Grid>
 </ContentPage>
diff --git a/src/PostIt/PostIt/Views/Commands/BrushPage.axaml b/src/PostIt/PostIt/Views/Commands/BrushPage.axaml
index 9c33cecb2..d01ea4a1b 100644
--- a/src/PostIt/PostIt/Views/Commands/BrushPage.axaml
+++ b/src/PostIt/PostIt/Views/Commands/BrushPage.axaml
@@ -3,6 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:cvm="using:PostIt.ViewModels.Commands"
+             xmlns:postitControls="using:PostIt.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="PostIt.Views.Commands.BrushPage"
 
@@ -93,16 +94,8 @@
                 Content="{Binding SubmitLabel}"
                 Command="{Binding SubmitCommand}"
                 IsEnabled="{Binding IsSupported}" />
-        <TextBox Grid.Column="2"
-                 Text="{Binding StatusMessage}"
-                 IsReadOnly="True"
-                 AcceptsReturn="True"
-                 TextWrapping="Wrap"
-                 BorderThickness="0"
-                 BorderBrush="Transparent"
-                 Padding="0"
-                 Background="Transparent"
-                 VerticalAlignment="Center" />
+        <postitControls:StatusBar Grid.Column="2"
+                DataContext="{Binding ActionStatus}" />
         <ProgressBar Grid.Column="3"
                      Width="120"
                      IsIndeterminate="True"
diff --git a/src/PostIt/PostIt/Views/Commands/RdvPage.axaml b/src/PostIt/PostIt/Views/Commands/RdvPage.axaml
index 46280602b..e521a5a6b 100644
--- a/src/PostIt/PostIt/Views/Commands/RdvPage.axaml
+++ b/src/PostIt/PostIt/Views/Commands/RdvPage.axaml
@@ -1,11 +1,13 @@
 <ContentPage xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:cvm="using:PostIt.ViewModels.Commands"
+             xmlns:mapsui="using:Mapsui.UI.Avalonia"
+             xmlns:postitControls="using:PostIt.Controls"
              x:Class="PostIt.Views.Commands.RdvPage"
              x:DataType="cvm:RdvViewModel"
              Header="Commande billing">
   <ScrollViewer>
-    <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="Auto,*" Margin="12">
+    <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="Auto,*" Margin="12">
       <TextBlock Grid.Row="0" Grid.ColumnSpan="2"
                  Text="{Binding Title}"
                  FontSize="18"
@@ -24,7 +26,7 @@
       <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding ActivityLabel}" IsReadOnly="True" Margin="0,0,0,8" />
 
       <TextBlock Grid.Row="4" Text="Date" VerticalAlignment="Center" Margin="0,0,12,8" />
-      <DatePicker Grid.Row="4" Grid.Column="1" DayFormat="ddd dd" SelectedDate="{Binding EventDate, Mode=TwoWay}" Margin="0,0,0,8" />
+      <DatePicker Grid.Row="4" Grid.Column="1" DayFormat="ddd dd" SelectedDate="{Binding EventDateSelection, Mode=TwoWay}" Margin="0,0,0,8" />
 
       <TextBlock Grid.Row="5"
                  Text="Motif"
@@ -38,49 +40,81 @@
       <TextBlock Grid.Row="6" Text="Adresse" VerticalAlignment="Center" Margin="0,0,12,8" />
       <TextBox Grid.Row="6" Grid.Column="1" Text="{Binding Address, Mode=TwoWay}" Margin="0,0,0,8" />
 
-      <Button Grid.Row="7"
-              Grid.ColumnSpan="2"
-              HorizontalAlignment="Left"
-              Margin="0,0,0,8"
-              Content="Utiliser ma position"
-              Command="{Binding UseCurrentLocationCommand}" />
+      <Grid Grid.Row="7"
+        x:Name="SuggestedAddressPanel"
+        Grid.ColumnSpan="2"
+          ColumnDefinitions="*,12,Auto,12,Auto"
+        Margin="0,0,0,8"
+        IsVisible="{Binding HasSuggestedAddressPanel}">
+        <TextBlock Grid.Column="0"
+           VerticalAlignment="Center"
+           Text="{Binding SuggestedAddress, StringFormat='Adresse suggérée: {0}'}"
+           TextWrapping="Wrap"
+           Opacity="0.8" />
+        <Button Grid.Column="2"
+          x:Name="ApplySuggestedAddressButton"
+            Content="Utiliser"
+          IsVisible="{Binding HasSuggestedAddress}"
+            Command="{Binding ApplySuggestedAddressCommand}" />
+        <ProgressBar Grid.Column="4"
+               x:Name="SuggestedAddressProgress"
+               Width="80"
+               IsIndeterminate="True"
+               IsVisible="{Binding IsResolvingAddress}" />
+      </Grid>
 
-      <TextBlock Grid.Row="8" Text="Latitude" VerticalAlignment="Center" Margin="0,0,12,8" />
-      <TextBox Grid.Row="8" Grid.Column="1" Text="{Binding Latitude, Mode=TwoWay}" PlaceholderText="Optionnel" Margin="0,0,0,8" />
+        <Grid Grid.Row="8"
+            Grid.ColumnSpan="2"
+            ColumnDefinitions="Auto,12,Auto"
+            Margin="0,0,0,8">
+        <Button Grid.Column="0"
+          HorizontalAlignment="Left"
+          Content="Utiliser ma position"
+          Command="{Binding UseCurrentLocationCommand}" />
+        <Button Grid.Column="2"
+          HorizontalAlignment="Left"
+          Content="Me localiser sur la carte"
+          Click="OnCenterCurrentLocationClicked"
+          IsEnabled="{Binding CanUseCurrentLocation}" />
+            </Grid>
 
-      <TextBlock Grid.Row="9" Text="Longitude" VerticalAlignment="Center" Margin="0,0,12,8" />
-      <TextBox Grid.Row="9" Grid.Column="1" Text="{Binding Longitude, Mode=TwoWay}" PlaceholderText="Optionnel" Margin="0,0,0,8" />
+            <TextBlock Grid.Row="9" Text="Latitude" VerticalAlignment="Center" Margin="0,0,12,8" />
+            <TextBox Grid.Row="9" Grid.Column="1" Text="{Binding Latitude, Mode=TwoWay}" PlaceholderText="Optionnel" Margin="0,0,0,8" />
 
+            <TextBlock Grid.Row="10" Text="Longitude" VerticalAlignment="Center" Margin="0,0,12,8" />
+            <TextBox Grid.Row="10" Grid.Column="1" Text="{Binding Longitude, Mode=TwoWay}" PlaceholderText="Optionnel" Margin="0,0,0,8" />
 
-      <TextBlock Grid.Row="12"
+            <TextBlock Grid.Row="11" Grid.ColumnSpan="2"
+             Text="Carte: cliquez pour positionner le rendez-vous"
+             Margin="0,0,0,8"
+             Opacity="0.85" />
+            <mapsui:MapControl Grid.Row="12"
+             Grid.ColumnSpan="2"
+             x:Name="LocationMap"
+             Height="260"
+             Margin="0,0,0,8" />
+
+            <TextBlock Grid.Row="13"
                  Text="Informations"
                  VerticalAlignment="Center"
                  Margin="0,0,12,8" />
-      <TextBox Grid.Row="12"
+            <TextBox Grid.Row="13"
                Grid.Column="1"
                Text="{Binding AdditionalInfo, Mode=TwoWay}"
                Margin="0,0,0,8" />
 
-      <CheckBox Grid.Row="13" Grid.ColumnSpan="2"
+            <CheckBox Grid.Row="14" Grid.ColumnSpan="2"
                 Content="Je consens à la création de cette commande"
                 IsChecked="{Binding Consent, Mode=TwoWay}"
                 Margin="0,4,0,12" />
 
-      <Grid Grid.Row="14" Grid.ColumnSpan="2" ColumnDefinitions="Auto,12,*,Auto">
+            <Grid Grid.Row="15" Grid.ColumnSpan="2" ColumnDefinitions="Auto,12,*,Auto">
         <Button Grid.Column="0"
                 Content="{Binding SubmitLabel}"
                 Command="{Binding SubmitCommand}"
                 IsEnabled="{Binding IsSupported}" />
-        <TextBox Grid.Column="2"
-                 Text="{Binding StatusMessage}"
-                 IsReadOnly="True"
-                 AcceptsReturn="True"
-                 TextWrapping="Wrap"
-                 BorderThickness="0"
-                 BorderBrush="Transparent"
-                 Padding="0"
-                 Background="Transparent"
-                 VerticalAlignment="Center" />
+        <postitControls:StatusBar Grid.Column="2"
+                DataContext="{Binding ActionStatus}" />
         <ProgressBar Grid.Column="3"
                      Width="120"
                      IsIndeterminate="True"
diff --git a/src/PostIt/PostIt/Views/Commands/RdvPage.axaml.cs b/src/PostIt/PostIt/Views/Commands/RdvPage.axaml.cs
index 6a0e1d059..749d15cdd 100644
--- a/src/PostIt/PostIt/Views/Commands/RdvPage.axaml.cs
+++ b/src/PostIt/PostIt/Views/Commands/RdvPage.axaml.cs
@@ -1,17 +1,236 @@
+using System;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using Mapsui;
+using Mapsui.Layers;
+using Mapsui.Projections;
+using Mapsui.Styles;
+using Mapsui.Tiling;
+using Mapsui.UI.Avalonia;
+using PostIt.Services;
+using PostIt.ViewModels.Commands;
 
 namespace PostIt.Views.Commands;
 
 public partial class RdvPage : ContentPage
 {
+    private const double DefaultLatitude = 48.8566;
+    private const double DefaultLongitude = 2.3522;
+    private const int DefaultZoomLevel = 4;
+    private const int SelectedZoomLevel = 13;
+    internal const double ReverseGeocodingCacheToleranceDegrees = 0.0001;
+    private static readonly TimeSpan ReverseGeocodingDebounce = TimeSpan.FromMilliseconds(350);
+
+    private MapControl? _locationMap;
+    private MemoryLayer? _selectionLayer;
+    private RdvViewModel? _currentViewModel;
+    private readonly IReverseGeocodingService _reverseGeocodingService;
+    private CancellationTokenSource? _reverseGeocodeCts;
+    private double? _lastResolvedLatitude;
+    private double? _lastResolvedLongitude;
+    private string? _lastResolvedAddress;
+
     public RdvPage()
+        : this(null)
     {
+    }
+
+    public RdvPage(IReverseGeocodingService? reverseGeocodingService)
+    {
+        _reverseGeocodingService = reverseGeocodingService ?? new NominatimReverseGeocodingService();
         InitializeComponent();
+        InitializeMap();
     }
 
     private void InitializeComponent()
     {
         AvaloniaXamlLoader.Load(this);
     }
+
+    private void InitializeMap()
+    {
+        _locationMap = this.FindControl<MapControl>("LocationMap");
+        if (_locationMap is null)
+            return;
+
+        var map = new Map();
+        map.Layers.Add(OpenStreetMap.CreateTileLayer());
+        _selectionLayer = CreateSelectionLayer();
+        map.Layers.Add(_selectionLayer);
+        _locationMap.Map = map;
+        _locationMap.MapTapped += OnMapTapped;
+
+        DataContextChanged += OnDataContextChanged;
+        AttachViewModel(DataContext as RdvViewModel);
+    }
+
+    private void OnDataContextChanged(object? sender, System.EventArgs e)
+    {
+        AttachViewModel(DataContext as RdvViewModel);
+        CenterFromViewModel();
+    }
+
+    private async void OnMapTapped(object? sender, MapEventArgs e)
+    {
+        if (DataContext is not RdvViewModel vm)
+            return;
+
+        var (longitude, latitude) = SphericalMercator.ToLonLat(e.WorldPosition.X, e.WorldPosition.Y);
+        vm.ApplyLocationFromMap(latitude, longitude);
+        UpdateMarkerFromViewModel();
+        CenterMap(latitude, longitude, zoomLevel: SelectedZoomLevel);
+        await TryResolveAddressAsync(vm, latitude, longitude);
+    }
+
+    private async void OnCenterCurrentLocationClicked(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+    {
+        if (DataContext is not RdvViewModel vm || !vm.CanUseCurrentLocation)
+            return;
+
+        await vm.UseCurrentLocationCommand.ExecuteAsync(null);
+        UpdateMarkerFromViewModel();
+        CenterFromViewModel();
+
+        if (vm.Latitude.HasValue && vm.Longitude.HasValue)
+            await TryResolveAddressAsync(vm, vm.Latitude.Value, vm.Longitude.Value);
+    }
+
+    private void AttachViewModel(RdvViewModel? vm)
+    {
+        if (_currentViewModel is not null)
+            _currentViewModel.PropertyChanged -= OnViewModelPropertyChanged;
+
+        _currentViewModel = vm;
+
+        if (_currentViewModel is not null)
+            _currentViewModel.PropertyChanged += OnViewModelPropertyChanged;
+
+        UpdateMarkerFromViewModel();
+    }
+
+    private void OnViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(RdvViewModel.Latitude)
+            || e.PropertyName == nameof(RdvViewModel.Longitude))
+        {
+            UpdateMarkerFromViewModel();
+        }
+    }
+
+    private void CenterFromViewModel()
+    {
+        if (DataContext is not RdvViewModel vm)
+        {
+            CenterMap(DefaultLatitude, DefaultLongitude, zoomLevel: DefaultZoomLevel);
+            return;
+        }
+
+        if (vm.Latitude.HasValue && vm.Longitude.HasValue)
+        {
+            CenterMap(vm.Latitude.Value, vm.Longitude.Value, zoomLevel: SelectedZoomLevel);
+            return;
+        }
+
+        CenterMap(DefaultLatitude, DefaultLongitude, zoomLevel: DefaultZoomLevel);
+    }
+
+    private void CenterMap(double latitude, double longitude, int zoomLevel)
+    {
+        if (_locationMap?.Map is null)
+            return;
+
+        var (x, y) = SphericalMercator.FromLonLat(longitude, latitude);
+        _locationMap.Map.Navigator.CenterOn(x, y);
+        _locationMap.Map.Navigator.ZoomToLevel(zoomLevel);
+    }
+
+    private void UpdateMarkerFromViewModel()
+    {
+        if (_selectionLayer is null)
+            return;
+
+        if (DataContext is not RdvViewModel vm
+            || !vm.Latitude.HasValue
+            || !vm.Longitude.HasValue)
+        {
+            _selectionLayer.Features = Enumerable.Empty<IFeature>();
+            _locationMap?.RefreshData(ChangeType.Discrete);
+            return;
+        }
+
+        var (x, y) = SphericalMercator.FromLonLat(vm.Longitude.Value, vm.Latitude.Value);
+        _selectionLayer.Features = new IFeature[] { new PointFeature(x, y) };
+        _locationMap?.RefreshData(ChangeType.Discrete);
+    }
+
+    private static MemoryLayer CreateSelectionLayer()
+    {
+        return new MemoryLayer("selected-location")
+        {
+            Style = new SymbolStyle
+            {
+                SymbolType = SymbolType.Ellipse,
+                Fill = new Brush(Color.Crimson),
+                Outline = new Pen(Color.White, 2),
+                SymbolScale = 0.9,
+            },
+            Features = Enumerable.Empty<IFeature>(),
+        };
+    }
+
+    private async Task TryResolveAddressAsync(RdvViewModel vm, double latitude, double longitude)
+    {
+        if (_lastResolvedLatitude.HasValue
+            && _lastResolvedLongitude.HasValue
+            && AreCoordinatesClose(_lastResolvedLatitude.Value, _lastResolvedLongitude.Value, latitude, longitude)
+            && !string.IsNullOrWhiteSpace(_lastResolvedAddress))
+        {
+            vm.ApplyResolvedAddress(_lastResolvedAddress);
+            return;
+        }
+
+        _reverseGeocodeCts?.Cancel();
+        _reverseGeocodeCts?.Dispose();
+        _reverseGeocodeCts = new CancellationTokenSource();
+        var cancellationToken = _reverseGeocodeCts.Token;
+
+        try
+        {
+            vm.NotifyReverseGeocodingStarted();
+            await Task.Delay(ReverseGeocodingDebounce, cancellationToken).ConfigureAwait(true);
+
+            var resolved = await _reverseGeocodingService
+                .TryResolveAddressAsync(latitude, longitude, cancellationToken)
+                .ConfigureAwait(true);
+
+            if (!string.IsNullOrWhiteSpace(resolved))
+            {
+                _lastResolvedLatitude = latitude;
+                _lastResolvedLongitude = longitude;
+                _lastResolvedAddress = resolved;
+                vm.ApplyResolvedAddress(resolved);
+                return;
+            }
+
+            vm.NotifyReverseGeocodingUnavailable();
+        }
+        catch (OperationCanceledException)
+        {
+            vm.IsResolvingAddress = false;
+        }
+    }
+
+    internal static bool AreCoordinatesClose(
+        double latitudeA,
+        double longitudeA,
+        double latitudeB,
+        double longitudeB)
+    {
+        return Math.Abs(latitudeA - latitudeB) <= ReverseGeocodingCacheToleranceDegrees
+            && Math.Abs(longitudeA - longitudeB) <= ReverseGeocodingCacheToleranceDegrees;
+    }
 }
diff --git a/src/PostIt/PostIt/Views/MainPage.axaml b/src/PostIt/PostIt/Views/MainPage.axaml
index 41ed7ece3..871a2f541 100644
--- a/src/PostIt/PostIt/Views/MainPage.axaml
+++ b/src/PostIt/PostIt/Views/MainPage.axaml
@@ -3,6 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:PostIt.ViewModels"
+             xmlns:postitControls="using:PostIt.Controls"
              xmlns:models="using:Yavsc.Blogspot"
              xmlns:views="using:PostIt.Views"
              xmlns:AvaloniaEdit="clr-namespace:AvaloniaEdit;assembly=AvaloniaEdit"
@@ -104,7 +105,8 @@
                   VerticalAlignment="Stretch">
                 </TextBox>
 
-                <TextBlock Grid.Row="3" Text="{Binding StatusMessage}" Foreground="Gray" />
+                <postitControls:StatusBar Grid.Row="3"
+                                          DataContext="{Binding ActionStatus}" />
 
             </Grid>
         </Border>
diff --git a/src/PostIt/PostIt/Views/PostAclDialog.axaml b/src/PostIt/PostIt/Views/PostAclDialog.axaml
index 8552988e5..4af8c018e 100644
--- a/src/PostIt/PostIt/Views/PostAclDialog.axaml
+++ b/src/PostIt/PostIt/Views/PostAclDialog.axaml
@@ -3,6 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="PostIt.Views.PostAclDialog"
         xmlns:vm="using:PostIt.ViewModels"
+    xmlns:postitControls="using:PostIt.Controls"
                 xmlns:dtos="using:Yavsc.Api.Client.Dtos"
         x:DataType="vm:PostAclDialogViewModel"
       >
@@ -53,8 +54,8 @@
 
         <!-- Status bar -->
         <Grid Grid.Row="3" ColumnDefinitions="*,Auto">
-            <TextBlock Grid.Column="0" Text="{Binding StatusMessage}"
-                       VerticalAlignment="Center"/>
+            <postitControls:StatusBar Grid.Column="0"
+                                      DataContext="{Binding ActionStatus}" />
             <ProgressBar Grid.Column="1" IsIndeterminate="True"
                          IsVisible="{Binding IsBusy}"
                          Width="120"/>
diff --git a/src/PostIt/PostIt/Views/SettingsPage.axaml b/src/PostIt/PostIt/Views/SettingsPage.axaml
index 611b89954..2973679b5 100644
--- a/src/PostIt/PostIt/Views/SettingsPage.axaml
+++ b/src/PostIt/PostIt/Views/SettingsPage.axaml
@@ -2,6 +2,7 @@
         xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="cl:avalonia.Controls"
+    xmlns:postitControls="using:PostIt.Controls"
         x:Class="PostIt.Views.SettingsPage"
         xmlns:vm="using:PostIt.ViewModels"
         x:DataType="vm:Settings"
@@ -51,9 +52,7 @@
                    Opacity="0.8"
                    TextWrapping="Wrap" />
 
-            <TextBlock x:Name="AvatarUploadStatusText"
-                       Text=""
-                       TextWrapping="Wrap" />
+            <postitControls:StatusBar DataContext="{Binding ActionStatus}"/>
 
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
             <Button x:Name="ChooseAvatarButton"
@@ -61,16 +60,11 @@
                     Click="ChooseAvatar_Click"
                     Margin="0,0,8,0"/>
 
-            <!-- Sauver: bound to the Save RelayCommand on the Settings
-                 VM. The source generator emits an ICommand property whose
-                 name matches the source method exactly (no "Command"
-                 suffix is added), so we bind {Binding Save} here. See
-                 AGENTS.md "Avalonia + CommunityToolkit.Mvvm : conventions
-                 de binding pour [RelayCommand]" for the full rationale.
-                 IsEnabled tracks IsDirty so the button auto-disables
-                 when there's nothing to persist. -->
+                <!-- Sauver: bind to the RelayCommand-generated property
+                 (SaveCommand). IsEnabled tracks IsDirty so the button
+                 auto-disables when there's nothing to persist. -->
             <Button Content="Sauver"
-                    Command="{Binding Save}"
+                    Command="{Binding SaveCommand}"
                     IsEnabled="{Binding IsDirty}"/>
                 </StackPanel>
         </StackPanel>
diff --git a/src/PostIt/PostIt/Views/SettingsPage.axaml.cs b/src/PostIt/PostIt/Views/SettingsPage.axaml.cs
index 593dcfeeb..b50245919 100644
--- a/src/PostIt/PostIt/Views/SettingsPage.axaml.cs
+++ b/src/PostIt/PostIt/Views/SettingsPage.axaml.cs
@@ -6,10 +6,10 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using Avalonia.Media;
 using Avalonia.Platform.Storage;
 using Microsoft.Extensions.DependencyInjection;
 using PostIt.Services;
+using PostIt.ViewModels;
 
 namespace PostIt.Views;
 public partial class SettingsPage: ContentPage
@@ -28,12 +28,12 @@ public partial class SettingsPage: ContentPage
     {
         var statusVersion = Interlocked.Increment(ref _avatarStatusVersion);
         ChooseAvatarButton.IsEnabled = false;
-        SetAvatarStatus("Sélection d'un fichier avatar...", Brushes.Gray);
+        SetAvatarStatus("Selection d'un fichier avatar...", StatusSeverity.Info);
 
         var topLevel = TopLevel.GetTopLevel(this);
         if (topLevel is null)
         {
-            SetAvatarStatus("Impossible d'accéder à la fenêtre active.", Brushes.IndianRed);
+            SetAvatarStatus("Impossible d'acceder a la fenetre active.", StatusSeverity.Error);
             ChooseAvatarButton.IsEnabled = true;
             return;
         }
@@ -54,27 +54,28 @@ public partial class SettingsPage: ContentPage
         var file = files.FirstOrDefault();
         if (file is null)
         {
-            SetAvatarStatus("Upload annulé.", Brushes.Gray);
+            SetAvatarStatus("Upload annule.", StatusSeverity.Warning);
             ChooseAvatarButton.IsEnabled = true;
             return;
         }
 
         try
         {
-            SetAvatarStatus("Upload avatar en cours...", Brushes.Gray);
+            SetAvatarStatus("Upload avatar en cours...", StatusSeverity.Info);
 
             await using var stream = await file.OpenReadAsync();
             var api = ((App)App.Current!).ServiceProvider!.GetRequiredService<YavscApiClient>();
             var message = await api.SetAvatarAsync(stream, file.Name, GetMimeType(file.Name));
             SetAvatarStatus(string.IsNullOrWhiteSpace(message)
-                ? "Avatar mis à jour."
-                : message, Brushes.ForestGreen);
+                ? "Avatar mis a jour."
+                : message,
+                StatusSeverity.Info);
 
             _ = ClearSuccessStatusLaterAsync(statusVersion);
         }
         catch (Exception ex)
         {
-            SetAvatarStatus($"Échec upload avatar: {ex.Message}", Brushes.IndianRed);
+            SetAvatarStatus($"Echec upload avatar: {ex.Message}", StatusSeverity.Error);
             Console.Error.WriteLine($"🩎 Avatar upload failed: {ex.Message}");
         }
         finally
@@ -89,16 +90,15 @@ public partial class SettingsPage: ContentPage
         if (statusVersion != _avatarStatusVersion)
             return;
 
-        if (AvatarUploadStatusText.Foreground == Brushes.ForestGreen)
-        {
-            SetAvatarStatus($"Avatar prêt. Formats supportés: {AcceptedAvatarFormats}. Taille max: {MaxAvatarSizeMegabytes} MB.", Brushes.Gray);
-        }
+        SetAvatarStatus($"Avatar pret. Formats supportes: {AcceptedAvatarFormats}. Taille max: {MaxAvatarSizeMegabytes} MB.", StatusSeverity.Info);
     }
 
-    private void SetAvatarStatus(string message, IBrush color)
+    private void SetAvatarStatus(string message, StatusSeverity severity)
     {
-        AvatarUploadStatusText.Foreground = color;
-        AvatarUploadStatusText.Text = message;
+        if (DataContext is Settings settings)
+        {
+            settings.SetActionStatus(message, severity);
+        }
     }
 
     private static string GetMimeType(string fileName)
diff --git a/src/PostIt/PostIt/Views/SignaturePage.axaml b/src/PostIt/PostIt/Views/SignaturePage.axaml
index d868f2a48..021208b54 100644
--- a/src/PostIt/PostIt/Views/SignaturePage.axaml
+++ b/src/PostIt/PostIt/Views/SignaturePage.axaml
@@ -3,6 +3,7 @@
              xmlns:d="http://github.com/avaloniaui/avalonia"
              xmlns:vm="using:PostIt.ViewModels"
              xmlns:controls="using:PostIt.Controls"
+             xmlns:postitControls="using:PostIt.Controls"
              x:Class="PostIt.Views.SignaturePage"
              x:DataType="vm:SignaturePageViewModel"
              HorizontalAlignment="Stretch"
@@ -59,10 +60,8 @@
             <Button Content="Capturer" Command="{Binding CaptureAsync}" />
         </StackPanel>
 
-        <TextBlock Grid.Row="3"
-                   Text="{Binding StatusMessage}"
-                   Foreground="Gray"
-                   TextWrapping="Wrap" />
+        <postitControls:StatusBar Grid.Row="3"
+                      DataContext="{Binding ActionStatus}" />
 
         <TextBlock Grid.Row="4"
                    FontSize="11"
diff --git a/src/PostIt/PostIt/postit-settings sample.json b/src/PostIt/PostIt/postit-settings sample.json
index 6d8da8faf..e23839b1f 100644
--- a/src/PostIt/PostIt/postit-settings sample.json	
+++ b/src/PostIt/PostIt/postit-settings sample.json	
@@ -5,7 +5,7 @@
     },
     "RedirectUri": "postit://callback",
     "DarkMode": false,
-    "ApiUrl": "https://blogs.pschneider.fr/api/v1/",
+    "ApiUrl": "https://api.pschneider.fr/api/v1/",
     "Scopes": [
         "openid",
         "profile",
diff --git a/src/PostIt/PostIt/postit-settings.json b/src/PostIt/PostIt/postit-settings.json
index 079479515..080fed178 100644
--- a/src/PostIt/PostIt/postit-settings.json
+++ b/src/PostIt/PostIt/postit-settings.json
@@ -5,7 +5,7 @@
     },
     "RedirectUri": "postit://callback",
     "DarkMode": true,
-    "ApiUrl": "https://blogs.pschneider.fr/api/v1/",
+    "ApiUrl": "https://api.pschneider.fr/api/v1/",
     "Scopes": [
         "openid",
         "profile",
diff --git a/src/Yavsc.Abstract/Billing/IBillable.cs b/src/Yavsc.Abstract/Billing/IBillable.cs
index 416dc5bee..f936a57df 100644
--- a/src/Yavsc.Abstract/Billing/IBillable.cs
+++ b/src/Yavsc.Abstract/Billing/IBillable.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using Yavsc.Services;
 
 namespace Yavsc.Billing
diff --git a/src/Yavsc.Abstract/Blogspot/BlogPostAuthorDto.cs b/src/Yavsc.Abstract/Blogspot/BlogPostAuthorDto.cs
index e332822e1..ab1b3fbe8 100644
--- a/src/Yavsc.Abstract/Blogspot/BlogPostAuthorDto.cs
+++ b/src/Yavsc.Abstract/Blogspot/BlogPostAuthorDto.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 namespace Yavsc.Blogspot;
 
 /// <summary>
diff --git a/src/Yavsc.Abstract/Blogspot/BlogPostDto.cs b/src/Yavsc.Abstract/Blogspot/BlogPostDto.cs
index 9cb5b1430..bdb2ccdc8 100644
--- a/src/Yavsc.Abstract/Blogspot/BlogPostDto.cs
+++ b/src/Yavsc.Abstract/Blogspot/BlogPostDto.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using Yavsc.Abstract.Identity.Security;
 using System.Text.Json.Serialization;
 
diff --git a/src/Yavsc.Abstract/Blogspot/IBlogPost.cs b/src/Yavsc.Abstract/Blogspot/IBlogPost.cs
index 1ef371803..38a50b78f 100644
--- a/src/Yavsc.Abstract/Blogspot/IBlogPost.cs
+++ b/src/Yavsc.Abstract/Blogspot/IBlogPost.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 
 
 
diff --git a/src/Yavsc.Abstract/Chat/ChatHubConstants.cs b/src/Yavsc.Abstract/Chat/ChatHubConstants.cs
index b54c00c74..c673e6fae 100644
--- a/src/Yavsc.Abstract/Chat/ChatHubConstants.cs
+++ b/src/Yavsc.Abstract/Chat/ChatHubConstants.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 namespace Yavsc.Abstract.Chat
 {
     public static class ChatHubConstants
diff --git a/src/Yavsc.Abstract/Chat/IChatRoom.cs b/src/Yavsc.Abstract/Chat/IChatRoom.cs
index 1d6f68dd5..133ca2837 100644
--- a/src/Yavsc.Abstract/Chat/IChatRoom.cs
+++ b/src/Yavsc.Abstract/Chat/IChatRoom.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.ComponentModel.DataAnnotations;
 
 namespace Yavsc.Abstract.Chat
diff --git a/src/Yavsc.Abstract/FileSystem/AbstractFileSystemHelpers.cs b/src/Yavsc.Abstract/FileSystem/AbstractFileSystemHelpers.cs
index dd805864e..14bc86435 100644
--- a/src/Yavsc.Abstract/FileSystem/AbstractFileSystemHelpers.cs
+++ b/src/Yavsc.Abstract/FileSystem/AbstractFileSystemHelpers.cs
@@ -1,4 +1,6 @@
-using System.Text;
+#nullable enable annotations
+
+using System.Text;
 using Yavsc.ViewModels.UserFiles;
 
 namespace Yavsc.Server.Helpers
diff --git a/src/Yavsc.Abstract/FileSystem/FsOperationInfo.cs b/src/Yavsc.Abstract/FileSystem/FsOperationInfo.cs
index 76a481492..0e3c0e0c7 100644
--- a/src/Yavsc.Abstract/FileSystem/FsOperationInfo.cs
+++ b/src/Yavsc.Abstract/FileSystem/FsOperationInfo.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 namespace Yavsc.Abstract.Helpers
 {
     public enum ErrorCode {
diff --git a/src/Yavsc.Abstract/FileSystem/UserDirectoryInfo.cs b/src/Yavsc.Abstract/FileSystem/UserDirectoryInfo.cs
index fa727d0c0..2ec5dcfaf 100644
--- a/src/Yavsc.Abstract/FileSystem/UserDirectoryInfo.cs
+++ b/src/Yavsc.Abstract/FileSystem/UserDirectoryInfo.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using Yavsc.Server.Helpers;
 
 namespace Yavsc.ViewModels.UserFiles
diff --git a/src/Yavsc.Abstract/Google/GDate.cs b/src/Yavsc.Abstract/Google/GDate.cs
index 3506ba416..10e4de92e 100644
--- a/src/Yavsc.Abstract/Google/GDate.cs
+++ b/src/Yavsc.Abstract/Google/GDate.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 //
 //  GDate.cs
 //
diff --git a/src/Yavsc.Abstract/Google/Messaging/MessageWithPayloadResponse.cs b/src/Yavsc.Abstract/Google/Messaging/MessageWithPayloadResponse.cs
index 59538ca62..980a4abcf 100644
--- a/src/Yavsc.Abstract/Google/Messaging/MessageWithPayloadResponse.cs
+++ b/src/Yavsc.Abstract/Google/Messaging/MessageWithPayloadResponse.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 //
 //  MessageWithPayloadResponse.cs
 //
diff --git a/src/Yavsc.Abstract/IT/Fixing/Bug.cs b/src/Yavsc.Abstract/IT/Fixing/Bug.cs
index f0b403bb7..60bd155f6 100644
--- a/src/Yavsc.Abstract/IT/Fixing/Bug.cs
+++ b/src/Yavsc.Abstract/IT/Fixing/Bug.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Yavsc.Attributes.Validation;
diff --git a/src/Yavsc.Abstract/Identity/IApplicationUser.cs b/src/Yavsc.Abstract/Identity/IApplicationUser.cs
index 5d1d5b1ca..0b8e1047c 100644
--- a/src/Yavsc.Abstract/Identity/IApplicationUser.cs
+++ b/src/Yavsc.Abstract/Identity/IApplicationUser.cs
@@ -1,4 +1,6 @@
-namespace Yavsc.Abstract.Identity
+#nullable enable annotations
+
+namespace Yavsc.Abstract.Identity
 {
     public interface IApplicationUser
     {
diff --git a/src/Yavsc.Abstract/Identity/UserDisplayHelpers.cs b/src/Yavsc.Abstract/Identity/UserDisplayHelpers.cs
index 242615527..4277d6e3b 100644
--- a/src/Yavsc.Abstract/Identity/UserDisplayHelpers.cs
+++ b/src/Yavsc.Abstract/Identity/UserDisplayHelpers.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 namespace Yavsc.Abstract.Identity
 {
     /// <summary>
diff --git a/src/Yavsc.Abstract/Interfaces/Workflow/IBookQueryData.cs b/src/Yavsc.Abstract/Interfaces/Workflow/IBookQueryData.cs
index 2c844f925..eb3dee591 100644
--- a/src/Yavsc.Abstract/Interfaces/Workflow/IBookQueryData.cs
+++ b/src/Yavsc.Abstract/Interfaces/Workflow/IBookQueryData.cs
@@ -1,4 +1,6 @@
-using Yavsc.Abstract.Identity;
+#nullable enable annotations
+
+using Yavsc.Abstract.Identity;
 
 namespace Yavsc.Interfaces
 {
diff --git a/src/Yavsc.Abstract/Messaging/Comment.cs b/src/Yavsc.Abstract/Messaging/Comment.cs
index 3b8702ae1..d8eef456c 100644
--- a/src/Yavsc.Abstract/Messaging/Comment.cs
+++ b/src/Yavsc.Abstract/Messaging/Comment.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 
 using Yavsc.Interfaces;
 
diff --git a/src/Yavsc.Abstract/Messaging/Notification.cs b/src/Yavsc.Abstract/Messaging/Notification.cs
index dbbf735d5..f7b35b48b 100644
--- a/src/Yavsc.Abstract/Messaging/Notification.cs
+++ b/src/Yavsc.Abstract/Messaging/Notification.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
diff --git a/src/Yavsc.Abstract/Messaging/RdvQueryEvent.cs b/src/Yavsc.Abstract/Messaging/RdvQueryEvent.cs
index b2168bd7c..9e2ecb754 100644
--- a/src/Yavsc.Abstract/Messaging/RdvQueryEvent.cs
+++ b/src/Yavsc.Abstract/Messaging/RdvQueryEvent.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 //
 //  BookQueryEvent.cs
 //
diff --git a/src/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs b/src/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs
index 87125c544..94eeb5ab9 100644
--- a/src/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs
+++ b/src/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using Yavsc.Abstract.Identity;
 using Yavsc.Models.Relationship;
 
diff --git a/src/Yavsc.Abstract/Workflow/IMobileDeviceDeclaration.cs b/src/Yavsc.Abstract/Workflow/IMobileDeviceDeclaration.cs
index 6e55ebe51..7a1dbc261 100644
--- a/src/Yavsc.Abstract/Workflow/IMobileDeviceDeclaration.cs
+++ b/src/Yavsc.Abstract/Workflow/IMobileDeviceDeclaration.cs
@@ -1,4 +1,6 @@
-// Copyright (C) 2016  Paul Schneider
+#nullable enable annotations
+
+// Copyright (C) 2016  Paul Schneider
 //
 // This file is part of yavsc.
 //
diff --git a/src/Yavsc.Abstract/Workflow/IPerformerProfile.cs b/src/Yavsc.Abstract/Workflow/IPerformerProfile.cs
index 4314dd371..606285a6c 100644
--- a/src/Yavsc.Abstract/Workflow/IPerformerProfile.cs
+++ b/src/Yavsc.Abstract/Workflow/IPerformerProfile.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 namespace Yavsc.Workflow
 {
     public interface IPerformerProfile
diff --git a/src/Yavsc.Abstract/Workflow/PerformerCodeInputValidation.cs b/src/Yavsc.Abstract/Workflow/PerformerCodeInputValidation.cs
index 84e9c1cc7..4ed60e465 100644
--- a/src/Yavsc.Abstract/Workflow/PerformerCodeInputValidation.cs
+++ b/src/Yavsc.Abstract/Workflow/PerformerCodeInputValidation.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
diff --git a/src/Yavsc.Api.Client/ActivityApiClient.cs b/src/Yavsc.Api.Client/ActivityApiClient.cs
index 52fad1a49..8199de9d4 100644
--- a/src/Yavsc.Api.Client/ActivityApiClient.cs
+++ b/src/Yavsc.Api.Client/ActivityApiClient.cs
@@ -19,19 +19,29 @@ public sealed class ActivityApiClient
     private const string PathPrefix = "activity";
 
     private readonly IYavscApiClient _api;
-    private readonly Uri _baseAddress;
-    private readonly Uri _avatarBaseAddress;
+    private readonly Func<string> _businessBaseAddress;
+    private readonly Func<string?> _avatarBaseAddress;
 
     public ActivityApiClient(IYavscApiClient api, string businessBaseAddress, string? avatarBaseAddress = null)
+        : this(
+            api,
+            () => businessBaseAddress,
+            () => avatarBaseAddress)
+    {
+    }
+
+    public ActivityApiClient(
+        IYavscApiClient api,
+        Func<string> businessBaseAddress,
+        Func<string?>? avatarBaseAddress = null)
     {
         _api = api ?? throw new ArgumentNullException(nameof(api));
-        if (string.IsNullOrEmpty(businessBaseAddress))
-            throw new ArgumentException("Base address is required.", nameof(businessBaseAddress));
+        _businessBaseAddress = businessBaseAddress ?? throw new ArgumentNullException(nameof(businessBaseAddress));
+        _avatarBaseAddress = avatarBaseAddress ?? (() => null);
 
-        _baseAddress = new Uri(businessBaseAddress, UriKind.Absolute);
-        _avatarBaseAddress = string.IsNullOrWhiteSpace(avatarBaseAddress)
-            ? _baseAddress
-            : new Uri(avatarBaseAddress, UriKind.Absolute);
+        // Validate initial values early to fail fast on invalid setup.
+        _ = ResolveBusinessBaseAddress();
+        _ = ResolveAvatarBaseAddress();
     }
 
     public Task<List<ActivityInfo>> GetCatalogAsync(
@@ -65,7 +75,7 @@ public sealed class ActivityApiClient
 
     public string BuildAvatarXsUrl(string? userName)
     {
-        var siteRoot = new Uri(_avatarBaseAddress, "/");
+        var siteRoot = new Uri(ResolveAvatarBaseAddress(), "/");
 
         if (string.IsNullOrWhiteSpace(userName))
         {
@@ -75,5 +85,22 @@ public sealed class ActivityApiClient
         return new Uri(siteRoot, $"avatars/{Uri.EscapeDataString(userName)}.xs.png").ToString();
     }
 
-    private string Absolute(string relativePath) => new Uri(_baseAddress, relativePath).ToString();
+    private string Absolute(string relativePath) => new Uri(ResolveBusinessBaseAddress(), relativePath).ToString();
+
+    private Uri ResolveBusinessBaseAddress()
+    {
+        var raw = _businessBaseAddress();
+        if (string.IsNullOrWhiteSpace(raw))
+            throw new InvalidOperationException("Business base address is required.");
+
+        return new Uri(raw, UriKind.Absolute);
+    }
+
+    private Uri ResolveAvatarBaseAddress()
+    {
+        var raw = _avatarBaseAddress();
+        return string.IsNullOrWhiteSpace(raw)
+            ? ResolveBusinessBaseAddress()
+            : new Uri(raw, UriKind.Absolute);
+    }
 }
diff --git a/src/Yavsc.Api.Client/BillingApiClient.cs b/src/Yavsc.Api.Client/BillingApiClient.cs
index 35a6722d5..c3a0be103 100644
--- a/src/Yavsc.Api.Client/BillingApiClient.cs
+++ b/src/Yavsc.Api.Client/BillingApiClient.cs
@@ -20,15 +20,20 @@ public sealed class BillingApiClient
     private const string PathPrefix = "billing";
 
     private readonly IYavscApiClient _api;
-    private readonly Uri _baseAddress;
+    private readonly Func<string> _businessBaseAddress;
 
     public BillingApiClient(IYavscApiClient api, string businessBaseAddress)
+        : this(api, () => businessBaseAddress)
+    {
+    }
+
+    public BillingApiClient(IYavscApiClient api, Func<string> businessBaseAddress)
     {
         _api = api ?? throw new ArgumentNullException(nameof(api));
-        if (string.IsNullOrWhiteSpace(businessBaseAddress))
-            throw new ArgumentException("Base address is required.", nameof(businessBaseAddress));
+        _businessBaseAddress = businessBaseAddress ?? throw new ArgumentNullException(nameof(businessBaseAddress));
 
-        _baseAddress = new Uri(businessBaseAddress, UriKind.Absolute);
+        // Validate initial value early to fail fast on invalid setup.
+        _ = ResolveBusinessBaseAddress();
     }
 
     public Task CreateAsync(string billingCode, object payload, CancellationToken ct = default)
@@ -121,7 +126,16 @@ public sealed class BillingApiClient
             ct: ct);
     }
 
-    private string Absolute(string relativePath) => new Uri(_baseAddress, relativePath).ToString();
+    private string Absolute(string relativePath) => new Uri(ResolveBusinessBaseAddress(), relativePath).ToString();
+
+    private Uri ResolveBusinessBaseAddress()
+    {
+        var raw = _businessBaseAddress();
+        if (string.IsNullOrWhiteSpace(raw))
+            throw new InvalidOperationException("Business base address is required.");
+
+        return new Uri(raw, UriKind.Absolute);
+    }
 
     private static BillingQueryDetailsDto MapRdv(RdvQueryResponse dto, string billingCode)
     {
diff --git a/src/Yavsc.Api.Test/Fixtures/ApiWebServerFixture.cs b/src/Yavsc.Api.Test/Fixtures/ApiWebServerFixture.cs
index ca4ae70f9..e2a8b3376 100644
--- a/src/Yavsc.Api.Test/Fixtures/ApiWebServerFixture.cs
+++ b/src/Yavsc.Api.Test/Fixtures/ApiWebServerFixture.cs
@@ -204,6 +204,10 @@ public sealed class ApiWebServerFixture : WebHostFixture
             ClientId = "alice",
             PerformerId = "alice",
             Consent = true,
+            UserCreated = "alice",
+            UserModified = "alice",
+            DateCreated = DateTime.UtcNow,
+            DateModified = DateTime.UtcNow,
             EventDate = DateTime.UtcNow.AddDays(1),
             Location = location,
             Reason = "Initial rendez-vous",
@@ -293,6 +297,10 @@ public sealed class ApiWebServerFixture : WebHostFixture
             ClientId = "alice",
             PerformerId = "alice",
             Consent = true,
+            UserCreated = "alice",
+            UserModified = "alice",
+            DateCreated = DateTime.UtcNow,
+            DateModified = DateTime.UtcNow,
             EventDate = DateTime.UtcNow.AddDays(3),
             Location = location,
             PrestationId = prestation1.Id,
@@ -308,6 +316,10 @@ public sealed class ApiWebServerFixture : WebHostFixture
             ClientId = "alice",
             PerformerId = "alice",
             Consent = true,
+            UserCreated = "alice",
+            UserModified = "alice",
+            DateCreated = DateTime.UtcNow,
+            DateModified = DateTime.UtcNow,
             EventDate = DateTime.UtcNow.AddDays(4),
             Location = location,
             Prestations = new List<HairPrestationCollectionItem>
diff --git a/src/Yavsc.Api.Test/FrontOfficeApiControllerTests.cs b/src/Yavsc.Api.Test/FrontOfficeApiControllerTests.cs
new file mode 100644
index 000000000..97ed2e61c
--- /dev/null
+++ b/src/Yavsc.Api.Test/FrontOfficeApiControllerTests.cs
@@ -0,0 +1,62 @@
+using System.Net;
+using System.Net.Http.Headers;
+using Microsoft.Extensions.DependencyInjection;
+using Yavsc.Api.Test.Fixtures;
+using Yavsc.Helpers;
+using Yavsc.Models;
+using Yavsc.Tests.Shared;
+
+namespace Yavsc.Api.Test;
+
+[Collection("Yavsc Api")]
+public sealed class FrontOfficeApiControllerTests : IClassFixture<ApiWebServerFixture>
+{
+    private readonly ApiWebServerFixture _fixture;
+
+    public FrontOfficeApiControllerTests(ApiWebServerFixture fixture)
+    {
+        _fixture = fixture;
+    }
+
+    private HttpClient NewClient(string subject = "alice", string scope = "api")
+    {
+        var handler = new HttpClientHandler
+        {
+            ServerCertificateCustomValidationCallback = (_, _, _, _) => true
+        };
+
+        var http = new HttpClient(handler)
+        {
+            BaseAddress = new Uri(_fixture.BaseAddress)
+        };
+        http.DefaultRequestHeaders.Authorization =
+            new AuthenticationHeaderValue("Bearer", TestTokenIssuer.Issue(subject, scope));
+        return http;
+    }
+
+    [Fact]
+    public async Task Front_accept_query_updates_status_without_server_error()
+    {
+        WorkflowHelpers.ConfigureBillingService();
+        _fixture.ResetAndSeedRdvQueryGraph();
+
+        long queryId;
+        using (var scope = _fixture.Services.CreateScope())
+        {
+            var db = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
+            queryId = db.RdvQueries.Select(q => q.Id).Single();
+        }
+
+        using var http = NewClient();
+        var response = await http.PostAsync($"/api/v1/front/query/accept?billingCode=Rdv&queryId={queryId}", content: null, TestContext.Current.CancellationToken);
+        var body = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
+
+        Assert.True(response.StatusCode == HttpStatusCode.OK, $"Unexpected status {(int)response.StatusCode} ({response.StatusCode}): {body}");
+
+        using var assertScope = _fixture.Services.CreateScope();
+        var assertDb = assertScope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
+        var updated = assertDb.RdvQueries.Single(q => q.Id == queryId);
+
+        Assert.Equal(QueryStatus.Accepted, updated.Status);
+    }
+}
diff --git a/src/Yavsc.Api.Test/RdvQueryApiControllerTests.cs b/src/Yavsc.Api.Test/RdvQueryApiControllerTests.cs
index 8fe7e959e..668814239 100644
--- a/src/Yavsc.Api.Test/RdvQueryApiControllerTests.cs
+++ b/src/Yavsc.Api.Test/RdvQueryApiControllerTests.cs
@@ -82,4 +82,65 @@ public sealed class RdvQueryApiControllerTests : IClassFixture<ApiWebServerFixtu
         var missingResponse = await http.GetAsync($"/api/v1/billing/Rdv/{fetched.Id}", TestContext.Current.CancellationToken);
         Assert.Equal(HttpStatusCode.NotFound, missingResponse.StatusCode);
     }
+
+    [Fact]
+    public async Task PostQuery_ignores_client_field_and_uses_authenticated_user()
+    {
+        _fixture.ResetAndSeedRdvQueryGraph();
+        using var http = NewClient(subject: "alice");
+
+        var createPayload = new
+        {
+            ActivityCode = "dev",
+            PerformerId = "alice",
+            Consent = true,
+            EventDate = DateTime.UtcNow.AddDays(2),
+            Location = new
+            {
+                Address = "2 rue du Test",
+                Latitude = 48.8567,
+                Longitude = 2.3523,
+            },
+            Reason = "Rendez-vous sans champ client",
+            Status = QueryStatus.Inserted,
+        };
+
+        var createResponse = await http.PostAsJsonAsync("/api/v1/billing/Rdv", createPayload, TestContext.Current.CancellationToken);
+        Assert.Equal(HttpStatusCode.Created, createResponse.StatusCode);
+
+        var created = await createResponse.Content.ReadFromJsonAsync<RdvQuery>(TestContext.Current.CancellationToken);
+        Assert.NotNull(created);
+        Assert.Equal("alice", created!.ClientId);
+    }
+
+    [Fact]
+    public async Task PostQuery_accepts_local_datetime_and_persists_as_utc()
+    {
+        _fixture.ResetAndSeedRdvQueryGraph();
+        using var http = NewClient(subject: "alice");
+
+        var localEventDate = DateTime.Now.AddDays(2);
+        var createPayload = new
+        {
+            ActivityCode = "dev",
+            PerformerId = "alice",
+            Consent = true,
+            EventDate = localEventDate,
+            Location = new
+            {
+                Address = "3 rue du Test",
+                Latitude = 48.8568,
+                Longitude = 2.3524,
+            },
+            Reason = "Rendez-vous date locale",
+            Status = QueryStatus.Inserted,
+        };
+
+        var createResponse = await http.PostAsJsonAsync("/api/v1/billing/Rdv", createPayload, TestContext.Current.CancellationToken);
+        Assert.Equal(HttpStatusCode.Created, createResponse.StatusCode);
+
+        var created = await createResponse.Content.ReadFromJsonAsync<RdvQuery>(TestContext.Current.CancellationToken);
+        Assert.NotNull(created);
+        Assert.Equal(DateTimeKind.Utc, created!.EventDate.Kind);
+    }
 }
diff --git a/src/Yavsc.Api/Controllers/Business/ActivityApiController.cs b/src/Yavsc.Api/Controllers/Business/ActivityApiController.cs
index a8d288063..aef393868 100644
--- a/src/Yavsc.Api/Controllers/Business/ActivityApiController.cs
+++ b/src/Yavsc.Api/Controllers/Business/ActivityApiController.cs
@@ -51,6 +51,14 @@ namespace Yavsc.Controllers
                 .Distinct()
                 .ToArray();
 
+            // Some providers are brittle when translating Contains over an
+            // empty in-memory array. If there is no candidate activity code,
+            // the catalog is empty by definition.
+            if (codes.Length == 0)
+            {
+                return Ok(new List<ActivityInfo>());
+            }
+
             var performerCounts = await (
                 from ua in _context.UserActivities.AsNoTracking()
                 where !string.IsNullOrWhiteSpace(ua.DoesCode) && codes.Contains(ua.DoesCode)
@@ -64,10 +72,10 @@ namespace Yavsc.Controllers
 
             var filteredActivities = activities
                 .Where(a =>
-                    (performerCounts.TryGetValue(a.Code, out var ownCount) && ownCount > 0)
+                    (TryGetPerformerCount(performerCounts, a.Code, out var ownCount) && ownCount > 0)
                     || (a.Children ?? new List<Activity>())
                         .Where(c => !c.Hidden)
-                        .Any(c => performerCounts.TryGetValue(c.Code, out var childCount) && childCount > 0))
+                        .Any(c => TryGetPerformerCount(performerCounts, c.Code, out var childCount) && childCount > 0))
                 .ToList();
 
             return Ok(filteredActivities.Select(a => ToBrowseItem(a, performerCounts)).ToList());
@@ -269,10 +277,10 @@ namespace Yavsc.Controllers
                 Code = activity.Code,
                 Name = activity.Name,
                 ParentCode = activity.ParentCode,
-                Description = activity.Description,
+                Description = activity.Description ?? string.Empty,
                 Photo = activity.Photo,
                 Rate = activity.Rate,
-                PerformerCount = performerCounts.TryGetValue(activity.Code, out var count) ? count : 0,
+                PerformerCount = TryGetPerformerCount(performerCounts, activity.Code, out var count) ? count : 0,
                 Forms = (activity.Forms ?? Enumerable.Empty<CommandForm>())
                     .Select(f => new CommandFormSummary
                     {
@@ -283,17 +291,17 @@ namespace Yavsc.Controllers
                     .ToList(),
                 Children = (activity.Children ?? Enumerable.Empty<Activity>())
                     .Where(c => !c.Hidden)
-                    .Where(c => performerCounts.TryGetValue(c.Code, out var childCount) && childCount > 0)
+                    .Where(c => TryGetPerformerCount(performerCounts, c.Code, out var childCount) && childCount > 0)
                     .OrderByDescending(c => c.Rate)
                     .Select(c => new ActivityInfo
                     {
                         Code = c.Code,
                         Name = c.Name,
                         ParentCode = c.ParentCode,
-                        Description = c.Description,
+                        Description = c.Description ?? string.Empty,
                         Photo = c.Photo,
                         Rate = c.Rate,
-                        PerformerCount = performerCounts.TryGetValue(c.Code, out var childCount) ? childCount : 0,
+                        PerformerCount = TryGetPerformerCount(performerCounts, c.Code, out var childCount) ? childCount : 0,
                         Forms = (c.Forms ?? Enumerable.Empty<CommandForm>())
                             .Select(f => new CommandFormSummary
                             {
@@ -306,5 +314,19 @@ namespace Yavsc.Controllers
                     .ToList(),
             };
         }
+
+        private static bool TryGetPerformerCount(
+            IReadOnlyDictionary<string, int> performerCounts,
+            string code,
+            out int count)
+        {
+            if (string.IsNullOrWhiteSpace(code))
+            {
+                count = 0;
+                return false;
+            }
+
+            return performerCounts.TryGetValue(code, out count);
+        }
     }
 }
diff --git a/src/Yavsc.Api/Controllers/Business/FrontOfficeApiController.cs b/src/Yavsc.Api/Controllers/Business/FrontOfficeApiController.cs
index a4ecbf2f8..3adac5b03 100644
--- a/src/Yavsc.Api/Controllers/Business/FrontOfficeApiController.cs
+++ b/src/Yavsc.Api/Controllers/Business/FrontOfficeApiController.cs
@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc;
 using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Services;
+using Yavsc.Server.Helpers;
 using Yavsc.ViewModels.FrontOffice;
 
 namespace Yavsc.ApiControllers
@@ -15,10 +16,10 @@ namespace Yavsc.ApiControllers
 
         private IBillingService billing;
 
-        public FrontOfficeApiController(ApplicationDbContext context, IBillingService billing)
+        public FrontOfficeApiController(ApplicationDbContext context, IBillingService billing = null)
         {
             dbContext = context;
-            this.billing = billing;
+            this.billing = billing ?? new BillingService(context);
         }
 
         [HttpGet("profiles/{actCode}")]
@@ -36,7 +37,7 @@ namespace Yavsc.ApiControllers
             if (billing == null) return BadRequest();
 
             billing.Status = QueryStatus.Rejected;
-            dbContext.SaveChanges();
+            dbContext.SaveChanges(User.GetUserId());
             return Ok();
         }
 
@@ -48,7 +49,7 @@ namespace Yavsc.ApiControllers
             var billing = BillingService.GetBillable(dbContext, billingCode, queryId);
             if (billing == null) return BadRequest();
             billing.Status = QueryStatus.Accepted;
-            dbContext.SaveChanges();
+            dbContext.SaveChanges(User.GetUserId());
             return Ok();
         }
     }
diff --git a/src/Yavsc.Api/Controllers/Business/HairCutQueryApiController.cs b/src/Yavsc.Api/Controllers/Business/HairCutQueryApiController.cs
index 6c7c1ba68..7f445fdd9 100644
--- a/src/Yavsc.Api/Controllers/Business/HairCutQueryApiController.cs
+++ b/src/Yavsc.Api/Controllers/Business/HairCutQueryApiController.cs
@@ -82,19 +82,17 @@ public class HairCutQueryApiController : Controller
     public async Task<IActionResult> PostQuery([FromBody] HairCutQuery query, CancellationToken cancellationToken)
     {
         var uid = User.GetUserId();
-        if (string.IsNullOrWhiteSpace(query.ClientId))
-        {
-            query.ClientId = uid;
-        }
+        query.ClientId = uid;
 
+        ModelState.Remove("Client");
         ModelState.Remove("ClientId");
+        ModelState.Remove("UserCreated");
+        ModelState.Remove("UserModified");
+        ModelState.Remove("SelectedProfile");
         ModelState.Remove("Prestation");
-
-        if (query.ClientId != uid && !User.IsInRole(Constants.AdminGroupName))
-        {
-            ModelState.AddModelError("ClientId", "You can only create your own HairCutQuery");
-            return BadRequest(ModelState);
-        }
+        ModelState.Remove("PerformerProfile");
+        ModelState.Remove("Context");
+        ModelState.Remove("Regularization");
 
         query.Prestation = await _context.HairPrestation
             .SingleOrDefaultAsync(p => p.Id == query.PrestationId, cancellationToken);
diff --git a/src/Yavsc.Api/Controllers/Business/HairMultiCutQueryApiController.cs b/src/Yavsc.Api/Controllers/Business/HairMultiCutQueryApiController.cs
index f850b3f41..3b33c4160 100644
--- a/src/Yavsc.Api/Controllers/Business/HairMultiCutQueryApiController.cs
+++ b/src/Yavsc.Api/Controllers/Business/HairMultiCutQueryApiController.cs
@@ -89,18 +89,16 @@ public class HairMultiCutQueryApiController : Controller
     public async Task<IActionResult> PostQuery([FromBody] HairMultiCutQuery query, CancellationToken cancellationToken)
     {
         var uid = User.GetUserId();
-        if (string.IsNullOrWhiteSpace(query.ClientId))
-        {
-            query.ClientId = uid;
-        }
+        query.ClientId = uid;
 
+        ModelState.Remove("Client");
         ModelState.Remove("ClientId");
-
-        if (query.ClientId != uid && !User.IsInRole(Constants.AdminGroupName))
-        {
-            ModelState.AddModelError("ClientId", "You can only create your own HairMultiCutQuery");
-            return BadRequest(ModelState);
-        }
+        ModelState.Remove("UserCreated");
+        ModelState.Remove("UserModified");
+        ModelState.Remove("SelectedProfile");
+        ModelState.Remove("PerformerProfile");
+        ModelState.Remove("Context");
+        ModelState.Remove("Regularization");
 
         if (query.Prestations is null || query.Prestations.Count == 0)
         {
diff --git a/src/Yavsc.Api/Controllers/Business/RdvQueryApiController.cs b/src/Yavsc.Api/Controllers/Business/RdvQueryApiController.cs
index fcfac2b22..48e3be2e1 100644
--- a/src/Yavsc.Api/Controllers/Business/RdvQueryApiController.cs
+++ b/src/Yavsc.Api/Controllers/Business/RdvQueryApiController.cs
@@ -65,18 +65,18 @@ public class RdvQueryApiController : Controller
     public async Task<IActionResult> PostQuery([FromBody] RdvQuery query, CancellationToken cancellationToken)
     {
         var uid = User.GetUserId();
-        if (string.IsNullOrWhiteSpace(query.ClientId))
-        {
-            query.ClientId = uid;
-        }
+        // Security: the caller always posts for themselves.
+        query.ClientId = uid;
+        query.EventDate = EnsureUtc(query.EventDate);
 
+        ModelState.Remove("Client");
         ModelState.Remove("ClientId");
-
-        if (query.ClientId != uid && !User.IsInRole(Constants.AdminGroupName))
-        {
-            ModelState.AddModelError("ClientId", "You can only create your own RdvQuery");
-            return BadRequest(ModelState);
-        }
+        ModelState.Remove("UserCreated");
+        ModelState.Remove("UserModified");
+        ModelState.Remove("SelectedProfile");
+        ModelState.Remove("PerformerProfile");
+        ModelState.Remove("Context");
+        ModelState.Remove("Regularization");
 
         if (!ModelState.IsValid)
         {
@@ -123,23 +123,44 @@ public class RdvQueryApiController : Controller
     [HttpPut("{id}")]
     public async Task<IActionResult> PutQuery([FromRoute] long id, [FromBody] RdvQuery query, CancellationToken cancellationToken)
     {
-        if (!ModelState.IsValid)
-        {
-            return BadRequest(ModelState);
-        }
-
-        if (id != query.Id)
-        {
-            return BadRequest();
-        }
-
         var uid = User.GetUserId();
-        if (query.ClientId != uid && !User.IsInRole(Constants.AdminGroupName))
+        var existing = await _context.RdvQueries
+            .Include(q => q.Location)
+            .SingleOrDefaultAsync(q => q.Id == id, cancellationToken);
+
+        if (existing is null)
+        {
+            return NotFound();
+        }
+
+        if (existing.ClientId != uid && !User.IsInRole(Constants.AdminGroupName))
         {
             return Forbid();
         }
 
-        _context.Entry(query).State = EntityState.Modified;
+        existing.ActivityCode = query.ActivityCode;
+        existing.PerformerId = query.PerformerId;
+        existing.Consent = query.Consent;
+        existing.EventDate = EnsureUtc(query.EventDate);
+        existing.LocationType = query.LocationType;
+        existing.Reason = query.Reason;
+        existing.Status = query.Status;
+        existing.Provisional = query.Provisional;
+
+        if (query.Location is not null)
+        {
+            var resolvedLocation = await _context.Locations.FirstOrDefaultAsync(
+                x => x.Address == query.Location.Address
+                  && x.Longitude == query.Location.Longitude
+                  && x.Latitude == query.Location.Latitude,
+                cancellationToken);
+
+            existing.Location = resolvedLocation ?? query.Location;
+            if (resolvedLocation is null)
+            {
+                _context.Attach(query.Location);
+            }
+        }
 
         try
         {
@@ -186,4 +207,14 @@ public class RdvQueryApiController : Controller
     {
         return _context.RdvQueries.Any(e => e.Id == id);
     }
+
+    private static DateTime EnsureUtc(DateTime value)
+    {
+        return value.Kind switch
+        {
+            DateTimeKind.Utc => value,
+            DateTimeKind.Local => value.ToUniversalTime(),
+            _ => DateTime.SpecifyKind(value, DateTimeKind.Utc)
+        };
+    }
 }
diff --git a/src/Yavsc.Blogs/Controllers/BlogApiController.cs b/src/Yavsc.Blogs/Controllers/BlogApiController.cs
index 8c76f7eea..b757d711b 100644
--- a/src/Yavsc.Blogs/Controllers/BlogApiController.cs
+++ b/src/Yavsc.Blogs/Controllers/BlogApiController.cs
@@ -55,6 +55,14 @@ namespace Yavsc.Blogs.Controllers
         [HttpPut("{id}")]
         public async Task<IActionResult> PutBlog(long id, [FromBody] Models.Blog.BlogPost blog)
         {
+            // These properties are server-managed or optional graph members and
+            // should not block JSON payloads coming from API clients.
+            ModelState.Remove(nameof(Models.Blog.BlogPost.Author));
+            ModelState.Remove(nameof(Models.Blog.BlogPost.Tags));
+            ModelState.Remove(nameof(Models.Blog.BlogPost.Comments));
+            ModelState.Remove(nameof(Models.Blog.BlogPost.UserCreated));
+            ModelState.Remove(nameof(Models.Blog.BlogPost.UserModified));
+
             if (!ModelState.IsValid)
             {
                 return BadRequest(ModelState);
@@ -87,6 +95,14 @@ namespace Yavsc.Blogs.Controllers
         [HttpPost]
         public IActionResult PostBlog([FromBody] Models.Blog.BlogPost blog)
         {
+            // These properties are server-managed or optional graph members and
+            // should not block JSON payloads coming from API clients.
+            ModelState.Remove(nameof(Models.Blog.BlogPost.Author));
+            ModelState.Remove(nameof(Models.Blog.BlogPost.Tags));
+            ModelState.Remove(nameof(Models.Blog.BlogPost.Comments));
+            ModelState.Remove(nameof(Models.Blog.BlogPost.UserCreated));
+            ModelState.Remove(nameof(Models.Blog.BlogPost.UserModified));
+
             if (!ModelState.IsValid)
             {
                 return BadRequest(ModelState);
diff --git a/src/Yavsc.Org/Controllers/Accounting/AccountController.cs b/src/Yavsc.Org/Controllers/Accounting/AccountController.cs
index 77e0e32a4..44927d461 100644
--- a/src/Yavsc.Org/Controllers/Accounting/AccountController.cs
+++ b/src/Yavsc.Org/Controllers/Accounting/AccountController.cs
@@ -467,8 +467,25 @@ IHtmlLocalizerFactory htmlLocalizerFactory,
 
             if (ModelState.IsValid)
             {
+                var existingUser = await _userManager.FindByEmailAsync(model.Email);
+                if (existingUser is not null)
+                {
+                    ModelState.AddModelError(nameof(model.Email), _localizer["DuplicateEmail"]);
+                    return View(model);
+                }
+
                 var user = new ApplicationUser { UserName = model.UserName, Email = model.Email };
-                var result = await _userManager.CreateAsync(user, model.Password);
+                IdentityResult result;
+                try
+                {
+                    result = await _userManager.CreateAsync(user, model.Password);
+                }
+                catch (DbUpdateException ex) when (IsDuplicateEmailViolation(ex))
+                {
+                    _logger.LogWarning(ex, "Registration rejected: duplicate email '{Email}'.", model.Email);
+                    ModelState.AddModelError(nameof(model.Email), _localizer["DuplicateEmail"]);
+                    return View(model);
+                }
                 if (result.Succeeded)
                 {
                     _logger.LogInformation(3, "User created a new account with password.");
@@ -517,6 +534,21 @@ IHtmlLocalizerFactory htmlLocalizerFactory,
             return View(model);
         }
 
+        private static bool IsDuplicateEmailViolation(Exception exception)
+        {
+            for (var current = exception; current is not null; current = current.InnerException)
+            {
+                if (current is PostgresException pg
+                    && pg.SqlState == PostgresErrorCodes.UniqueViolation
+                    && string.Equals(pg.ConstraintName, "AK_AspNetUsers_Email", StringComparison.Ordinal))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         [Authorize, HttpPost, ValidateAntiForgeryToken]
         public async Task<IActionResult> SendConfirationEmail()
         {
diff --git a/src/Yavsc.Org/Controllers/Communicating/CommentsController.cs b/src/Yavsc.Org/Controllers/Communicating/CommentsController.cs
index 3690671c5..02dda32a1 100644
--- a/src/Yavsc.Org/Controllers/Communicating/CommentsController.cs
+++ b/src/Yavsc.Org/Controllers/Communicating/CommentsController.cs
@@ -121,6 +121,7 @@ namespace Yavsc.Controllers
         public async Task<IActionResult> Create(Comment comment)
         {
             comment.UserCreated = User.GetUserId();
+            comment.UserModified = comment.UserCreated;
             // AuthorId/UserCreated is set server-side after model binding;
             // remove the stale binding error so a valid authenticated POST
             // does not fall into the invalid branch.
@@ -129,7 +130,7 @@ namespace Yavsc.Controllers
             if (ModelState.IsValid)
             {
                 _context.Comment.Add(comment);
-                await _context.SaveChangesAsync();
+                await _context.SaveChangesAsync(comment.UserCreated);
                 return RedirectToAction("Index");
             }
             ViewBag.ReceiverId = new SelectList(_context.BlogSpot, "Id", "Title", comment.ReceiverId);
diff --git a/src/Yavsc.Server/Config.cs b/src/Yavsc.Server/Config.cs
index 5d2bcdffb..e68546eff 100644
--- a/src/Yavsc.Server/Config.cs
+++ b/src/Yavsc.Server/Config.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 
 using IdentityServer8;
 using IdentityServer8.Models;
diff --git a/src/Yavsc.Server/Constants.cs b/src/Yavsc.Server/Constants.cs
index 4ded48eae..8859e5e69 100644
--- a/src/Yavsc.Server/Constants.cs
+++ b/src/Yavsc.Server/Constants.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 namespace Yavsc.Server
 {
 
diff --git a/src/Yavsc.Server/Exceptions/AuthorizationFailureException.cs b/src/Yavsc.Server/Exceptions/AuthorizationFailureException.cs
index a3c5105ec..4a588dfd9 100644
--- a/src/Yavsc.Server/Exceptions/AuthorizationFailureException.cs
+++ b/src/Yavsc.Server/Exceptions/AuthorizationFailureException.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 namespace Yavsc.Server.Exceptions;
 
 [Serializable]
diff --git a/src/Yavsc.Server/Exceptions/YavscInfrastructureException.cs b/src/Yavsc.Server/Exceptions/YavscInfrastructureException.cs
index 7888970c5..583872414 100644
--- a/src/Yavsc.Server/Exceptions/YavscInfrastructureException.cs
+++ b/src/Yavsc.Server/Exceptions/YavscInfrastructureException.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 namespace Yavsc.Services
 {
     [Serializable]
diff --git a/src/Yavsc.Server/Helpers/BillingHelpers.cs b/src/Yavsc.Server/Helpers/BillingHelpers.cs
index c10a76155..789b85a96 100644
--- a/src/Yavsc.Server/Helpers/BillingHelpers.cs
+++ b/src/Yavsc.Server/Helpers/BillingHelpers.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.Globalization;
 using Yavsc.Billing;
 using Yavsc.Models.Billing;
diff --git a/src/Yavsc.Server/Helpers/EstimateSignatureFileHelper.cs b/src/Yavsc.Server/Helpers/EstimateSignatureFileHelper.cs
index e2d40266d..8545c3a0a 100644
--- a/src/Yavsc.Server/Helpers/EstimateSignatureFileHelper.cs
+++ b/src/Yavsc.Server/Helpers/EstimateSignatureFileHelper.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.Security.Claims;
 using System.Text;
 using System.Text.Json;
diff --git a/src/Yavsc.Server/Helpers/FileSystemHelpers.cs b/src/Yavsc.Server/Helpers/FileSystemHelpers.cs
index 7d9d86ed0..29ada6b77 100644
--- a/src/Yavsc.Server/Helpers/FileSystemHelpers.cs
+++ b/src/Yavsc.Server/Helpers/FileSystemHelpers.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 
 
 using System.Security.Claims;
diff --git a/src/Yavsc.Server/Helpers/HtmlHelpers.cs b/src/Yavsc.Server/Helpers/HtmlHelpers.cs
index 213ea369a..c23f05cd2 100644
--- a/src/Yavsc.Server/Helpers/HtmlHelpers.cs
+++ b/src/Yavsc.Server/Helpers/HtmlHelpers.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Http;
 using Yavsc.Models.Drawing;
diff --git a/src/Yavsc.Server/Helpers/PayPalHelpers.cs b/src/Yavsc.Server/Helpers/PayPalHelpers.cs
index 9d4074d46..51902c784 100644
--- a/src/Yavsc.Server/Helpers/PayPalHelpers.cs
+++ b/src/Yavsc.Server/Helpers/PayPalHelpers.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using Microsoft.Extensions.Logging;
 using Yavsc.Models.Billing;
 using Microsoft.AspNetCore.Http;
diff --git a/src/Yavsc.Server/Helpers/RequestHelper.cs b/src/Yavsc.Server/Helpers/RequestHelper.cs
index 99fe15248..6b85a5c31 100644
--- a/src/Yavsc.Server/Helpers/RequestHelper.cs
+++ b/src/Yavsc.Server/Helpers/RequestHelper.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.Net;
 using System.Net.Http.Headers;
 using Yavsc.Server.Model;
diff --git a/src/Yavsc.Server/Helpers/ServiceExtensions.cs b/src/Yavsc.Server/Helpers/ServiceExtensions.cs
index 06e877be8..1a69ca42f 100644
--- a/src/Yavsc.Server/Helpers/ServiceExtensions.cs
+++ b/src/Yavsc.Server/Helpers/ServiceExtensions.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.Extensions.Configuration;
diff --git a/src/Yavsc.Server/Helpers/UserHelpers.cs b/src/Yavsc.Server/Helpers/UserHelpers.cs
index c3ee708d6..f0a30995f 100644
--- a/src/Yavsc.Server/Helpers/UserHelpers.cs
+++ b/src/Yavsc.Server/Helpers/UserHelpers.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using Microsoft.EntityFrameworkCore;
 using System.Security.Claims;
 using Yavsc.Models;
diff --git a/src/Yavsc.Server/Hubs/ChatHub.cs b/src/Yavsc.Server/Hubs/ChatHub.cs
index 4a99b507c..799f7441c 100644
--- a/src/Yavsc.Server/Hubs/ChatHub.cs
+++ b/src/Yavsc.Server/Hubs/ChatHub.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 //
 //  ChatHub.cs
 //
diff --git a/src/Yavsc.Server/Hubs/HubInputValidator.cs b/src/Yavsc.Server/Hubs/HubInputValidator.cs
index a6acac5ac..a2382c11e 100644
--- a/src/Yavsc.Server/Hubs/HubInputValidator.cs
+++ b/src/Yavsc.Server/Hubs/HubInputValidator.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 //
 //  ChatHub.cs
 //
diff --git a/src/Yavsc.Server/Models/Access/GrantViewModel.cs b/src/Yavsc.Server/Models/Access/GrantViewModel.cs
index d9d0e1562..d0d379caa 100644
--- a/src/Yavsc.Server/Models/Access/GrantViewModel.cs
+++ b/src/Yavsc.Server/Models/Access/GrantViewModel.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
diff --git a/src/Yavsc.Server/Models/ApplicationDbContext.cs b/src/Yavsc.Server/Models/ApplicationDbContext.cs
index cb08023a3..ade093c15 100644
--- a/src/Yavsc.Server/Models/ApplicationDbContext.cs
+++ b/src/Yavsc.Server/Models/ApplicationDbContext.cs
@@ -108,6 +108,7 @@ namespace Yavsc.Models
             ;
 
             builder.Entity<Activity>().Property(a => a.ParentCode).IsRequired(false);
+            builder.Entity<Activity>().Property(a => a.Description).IsRequired(false);
 
             builder.Entity<Country>().HasKey(c => c.Code);
             builder.Entity<PerformerCodeInputValidation>()
diff --git a/src/Yavsc.Server/Models/ApplicationUser.cs b/src/Yavsc.Server/Models/ApplicationUser.cs
index 355e0ad15..69fbf1e52 100644
--- a/src/Yavsc.Server/Models/ApplicationUser.cs
+++ b/src/Yavsc.Server/Models/ApplicationUser.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Newtonsoft.Json;
diff --git a/src/Yavsc.Server/Models/Auth/DeviceDeclaration.cs b/src/Yavsc.Server/Models/Auth/DeviceDeclaration.cs
index 1db1d89e0..7ed5e9b0d 100644
--- a/src/Yavsc.Server/Models/Auth/DeviceDeclaration.cs
+++ b/src/Yavsc.Server/Models/Auth/DeviceDeclaration.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Newtonsoft.Json;
diff --git a/src/Yavsc.Server/Models/Bank/BankIdentity.cs b/src/Yavsc.Server/Models/Bank/BankIdentity.cs
index eea65d691..092059acc 100644
--- a/src/Yavsc.Server/Models/Bank/BankIdentity.cs
+++ b/src/Yavsc.Server/Models/Bank/BankIdentity.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
diff --git a/src/Yavsc.Server/Models/Billing/Estimate.cs b/src/Yavsc.Server/Models/Billing/Estimate.cs
index e6495a140..24cd021a8 100644
--- a/src/Yavsc.Server/Models/Billing/Estimate.cs
+++ b/src/Yavsc.Server/Models/Billing/Estimate.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
diff --git a/src/Yavsc.Server/Models/Billing/NominativeServiceCommand.cs b/src/Yavsc.Server/Models/Billing/NominativeServiceCommand.cs
index ad651d368..aa9e06abf 100644
--- a/src/Yavsc.Server/Models/Billing/NominativeServiceCommand.cs
+++ b/src/Yavsc.Server/Models/Billing/NominativeServiceCommand.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
diff --git a/src/Yavsc.Server/Models/Billing/histoestim.cs b/src/Yavsc.Server/Models/Billing/histoestim.cs
index 1f9b99f1f..df2860f5d 100644
--- a/src/Yavsc.Server/Models/Billing/histoestim.cs
+++ b/src/Yavsc.Server/Models/Billing/histoestim.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 namespace Yavsc.Models.Billing
 {
     public partial class histoestim
diff --git a/src/Yavsc.Server/Models/Blog/BlogPost.cs b/src/Yavsc.Server/Models/Blog/BlogPost.cs
index 4c2f2ae5c..6dc8ff750 100644
--- a/src/Yavsc.Server/Models/Blog/BlogPost.cs
+++ b/src/Yavsc.Server/Models/Blog/BlogPost.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Newtonsoft.Json;
diff --git a/src/Yavsc.Server/Models/Blog/Comment.cs b/src/Yavsc.Server/Models/Blog/Comment.cs
index 4d39d0c2e..5d7cc2912 100644
--- a/src/Yavsc.Server/Models/Blog/Comment.cs
+++ b/src/Yavsc.Server/Models/Blog/Comment.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Newtonsoft.Json;
diff --git a/src/Yavsc.Server/Models/Calendar/Period.cs b/src/Yavsc.Server/Models/Calendar/Period.cs
index dfc285cf3..f333235b1 100644
--- a/src/Yavsc.Server/Models/Calendar/Period.cs
+++ b/src/Yavsc.Server/Models/Calendar/Period.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 //
 //  Period.cs
 //
diff --git a/src/Yavsc.Server/Models/ErrorViewModel.cs b/src/Yavsc.Server/Models/ErrorViewModel.cs
index 178194769..087aa505b 100644
--- a/src/Yavsc.Server/Models/ErrorViewModel.cs
+++ b/src/Yavsc.Server/Models/ErrorViewModel.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 namespace Yavsc.Models;
 
 public class ErrorViewModel
diff --git a/src/Yavsc.Server/Models/HairCut/BrusherProfile.cs b/src/Yavsc.Server/Models/HairCut/BrusherProfile.cs
index ba47bfdce..d89a56fa8 100644
--- a/src/Yavsc.Server/Models/HairCut/BrusherProfile.cs
+++ b/src/Yavsc.Server/Models/HairCut/BrusherProfile.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 
 //
 //  BrusherProfile.cs
diff --git a/src/Yavsc.Server/Models/HairCut/HairCutPaymentEvent.cs b/src/Yavsc.Server/Models/HairCut/HairCutPaymentEvent.cs
index 353249288..2c96a7d80 100644
--- a/src/Yavsc.Server/Models/HairCut/HairCutPaymentEvent.cs
+++ b/src/Yavsc.Server/Models/HairCut/HairCutPaymentEvent.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using Microsoft.Extensions.Localization;
 
 using Yavsc.Interfaces.Workflow;
diff --git a/src/Yavsc.Server/Models/HairCut/HairCutQuery.cs b/src/Yavsc.Server/Models/HairCut/HairCutQuery.cs
index 0960db6d6..680cf6956 100644
--- a/src/Yavsc.Server/Models/HairCut/HairCutQuery.cs
+++ b/src/Yavsc.Server/Models/HairCut/HairCutQuery.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Yavsc.Models.Billing;
diff --git a/src/Yavsc.Server/Models/HairCut/HairCutQueryEvent.cs b/src/Yavsc.Server/Models/HairCut/HairCutQueryEvent.cs
index bd30fb784..fadc353a8 100644
--- a/src/Yavsc.Server/Models/HairCut/HairCutQueryEvent.cs
+++ b/src/Yavsc.Server/Models/HairCut/HairCutQueryEvent.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using Yavsc.Interfaces.Workflow;
 
 namespace Yavsc.Models.Haircut
diff --git a/src/Yavsc.Server/Models/HairCut/HairMultiCutQuery.cs b/src/Yavsc.Server/Models/HairCut/HairMultiCutQuery.cs
index 21ae437ce..beb7da9ac 100644
--- a/src/Yavsc.Server/Models/HairCut/HairMultiCutQuery.cs
+++ b/src/Yavsc.Server/Models/HairCut/HairMultiCutQuery.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Yavsc.Models.Billing;
diff --git a/src/Yavsc.Server/Models/HairCut/HairPrestation.cs b/src/Yavsc.Server/Models/HairCut/HairPrestation.cs
index 6153f6483..2e2cf8ca6 100644
--- a/src/Yavsc.Server/Models/HairCut/HairPrestation.cs
+++ b/src/Yavsc.Server/Models/HairCut/HairPrestation.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Reflection;
diff --git a/src/Yavsc.Server/Models/HairCut/Views/HaircutQueryInfo.cs b/src/Yavsc.Server/Models/HairCut/Views/HaircutQueryInfo.cs
index c9213862e..4099dbcaa 100644
--- a/src/Yavsc.Server/Models/HairCut/Views/HaircutQueryInfo.cs
+++ b/src/Yavsc.Server/Models/HairCut/Views/HaircutQueryInfo.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 
 //
 //  HaircutQueryInfo.cs
diff --git a/src/Yavsc.Server/Models/IT/SourceCode/GitClone.cs b/src/Yavsc.Server/Models/IT/SourceCode/GitClone.cs
index 826e5de38..d58551a65 100644
--- a/src/Yavsc.Server/Models/IT/SourceCode/GitClone.cs
+++ b/src/Yavsc.Server/Models/IT/SourceCode/GitClone.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 // // GitClone.cs
 // /*
 // paul  21/06/2018 11:27 20182018 6 21
diff --git a/src/Yavsc.Server/Models/IT/SourceCode/ProjectBuild.cs b/src/Yavsc.Server/Models/IT/SourceCode/ProjectBuild.cs
index f65b17b51..eb1afe214 100644
--- a/src/Yavsc.Server/Models/IT/SourceCode/ProjectBuild.cs
+++ b/src/Yavsc.Server/Models/IT/SourceCode/ProjectBuild.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.Diagnostics;
 
 namespace Yavsc.Server.Models.IT.SourceCode
diff --git a/src/Yavsc.Server/Models/IT/SourceCode/SingleCmdProjectBatch.cs b/src/Yavsc.Server/Models/IT/SourceCode/SingleCmdProjectBatch.cs
index 2ce162564..0fb2116f5 100644
--- a/src/Yavsc.Server/Models/IT/SourceCode/SingleCmdProjectBatch.cs
+++ b/src/Yavsc.Server/Models/IT/SourceCode/SingleCmdProjectBatch.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.Diagnostics;
 
 namespace Yavsc.Server.Models.IT.SourceCode
diff --git a/src/Yavsc.Server/Models/IdentityUserLogin.cs b/src/Yavsc.Server/Models/IdentityUserLogin.cs
index bfbd4e899..78567f68f 100644
--- a/src/Yavsc.Server/Models/IdentityUserLogin.cs
+++ b/src/Yavsc.Server/Models/IdentityUserLogin.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 namespace Yavsc.Models.Auth
 {
     using System.ComponentModel.DataAnnotations.Schema;
diff --git a/src/Yavsc.Server/Models/Kyc/TrustDeclaration.cs b/src/Yavsc.Server/Models/Kyc/TrustDeclaration.cs
index 0a97eb6a9..fe9fc2ec4 100644
--- a/src/Yavsc.Server/Models/Kyc/TrustDeclaration.cs
+++ b/src/Yavsc.Server/Models/Kyc/TrustDeclaration.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 // Yavsc.Models.Kyc/TrustDeclaration.cs
 namespace Yavsc.Models.Kyc
 {
diff --git a/src/Yavsc.Server/Models/Kyc/TrustToken.cs b/src/Yavsc.Server/Models/Kyc/TrustToken.cs
index 2e240bae1..8c09d39cd 100644
--- a/src/Yavsc.Server/Models/Kyc/TrustToken.cs
+++ b/src/Yavsc.Server/Models/Kyc/TrustToken.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 // Yavsc.Models.Kyc/TrustToken.cs
 namespace Yavsc.Models.Kyc
 {
diff --git a/src/Yavsc.Server/Models/Market/Product.cs b/src/Yavsc.Server/Models/Market/Product.cs
index ae8f29199..84f5709ca 100644
--- a/src/Yavsc.Server/Models/Market/Product.cs
+++ b/src/Yavsc.Server/Models/Market/Product.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 
 
 using System.ComponentModel.DataAnnotations;
diff --git a/src/Yavsc.Server/Models/Relationship/StaticContact.cs b/src/Yavsc.Server/Models/Relationship/StaticContact.cs
index 7ae6ab6ae..05ebf04da 100644
--- a/src/Yavsc.Server/Models/Relationship/StaticContact.cs
+++ b/src/Yavsc.Server/Models/Relationship/StaticContact.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 
 namespace Yavsc.Models.Relationship
 {
diff --git a/src/Yavsc.Server/Models/Workflow/Activity.cs b/src/Yavsc.Server/Models/Workflow/Activity.cs
index 0f813a273..e82ac9709 100644
--- a/src/Yavsc.Server/Models/Workflow/Activity.cs
+++ b/src/Yavsc.Server/Models/Workflow/Activity.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Newtonsoft.Json;
@@ -35,7 +37,7 @@ namespace Yavsc.Models.Workflow
         public virtual List<Activity> Children { get; set; }
 
         [Display(Name = "Description")]
-        public string Description { get; set; }
+        public string? Description { get; set; }
 
         [Display(Name = "Photo")]
         public string? Photo { get; set; }
diff --git a/src/Yavsc.Server/Models/Workflow/PerformerProfile.cs b/src/Yavsc.Server/Models/Workflow/PerformerProfile.cs
index 23bd688b4..c2f312b84 100644
--- a/src/Yavsc.Server/Models/Workflow/PerformerProfile.cs
+++ b/src/Yavsc.Server/Models/Workflow/PerformerProfile.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
diff --git a/src/Yavsc.Server/Models/Workflow/RdvQuery.cs b/src/Yavsc.Server/Models/Workflow/RdvQuery.cs
index f821fc75d..cd56f3676 100644
--- a/src/Yavsc.Server/Models/Workflow/RdvQuery.cs
+++ b/src/Yavsc.Server/Models/Workflow/RdvQuery.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
diff --git a/src/Yavsc.Server/Models/societe.com/CompanyInfo.cs b/src/Yavsc.Server/Models/societe.com/CompanyInfo.cs
index 114c4d8e3..354bc4861 100644
--- a/src/Yavsc.Server/Models/societe.com/CompanyInfo.cs
+++ b/src/Yavsc.Server/Models/societe.com/CompanyInfo.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 
 
 using System.ComponentModel.DataAnnotations;
diff --git a/src/Yavsc.Server/Services/BillingService.cs b/src/Yavsc.Server/Services/BillingService.cs
index ad9361767..1a0bc199d 100644
--- a/src/Yavsc.Server/Services/BillingService.cs
+++ b/src/Yavsc.Server/Services/BillingService.cs
@@ -1,6 +1,7 @@
 using System.Reflection;
 using Microsoft.EntityFrameworkCore;
 using Yavsc.Abstract.Workflow;
+using Yavsc.Helpers;
 using Yavsc.Models;
 
 namespace Yavsc.Services
@@ -35,7 +36,34 @@ namespace Yavsc.Services
 
         public static IQuery GetBillable(ApplicationDbContext context, string billingCode, long queryId)
         {
-            throw new NotImplementedException();
+            if (context is null) throw new ArgumentNullException(nameof(context));
+            if (string.IsNullOrWhiteSpace(billingCode) || queryId <= 0)
+            {
+                return null;
+            }
+
+            if (Billing.Count == 0)
+            {
+                WorkflowHelpers.ConfigureBillingService();
+            }
+
+            var getter = Billing
+                .FirstOrDefault(kvp => string.Equals(kvp.Key, billingCode.Trim(), StringComparison.OrdinalIgnoreCase))
+                .Value;
+
+            if (getter is null)
+            {
+                return null;
+            }
+
+            try
+            {
+                return getter(context, queryId);
+            }
+            catch (InvalidOperationException)
+            {
+                return null;
+            }
         }
 
 
diff --git a/src/Yavsc.Server/Services/BlogSpotService.cs b/src/Yavsc.Server/Services/BlogSpotService.cs
index a08326303..20f7245e5 100644
--- a/src/Yavsc.Server/Services/BlogSpotService.cs
+++ b/src/Yavsc.Server/Services/BlogSpotService.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.Diagnostics;
 using System.Security.Claims;
 using Microsoft.AspNetCore.Authorization;
diff --git a/src/Yavsc.Server/Services/ClaudeModerationService.cs b/src/Yavsc.Server/Services/ClaudeModerationService.cs
index a510e55cb..a47952318 100644
--- a/src/Yavsc.Server/Services/ClaudeModerationService.cs
+++ b/src/Yavsc.Server/Services/ClaudeModerationService.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using Yavsc.Moderation;
 using Yavsc.Abstract.Interfaces;
 using Anthropic.SDK;
diff --git a/src/Yavsc.Server/Services/LiveProcessor.cs b/src/Yavsc.Server/Services/LiveProcessor.cs
index f10a8201a..560ee6d0a 100644
--- a/src/Yavsc.Server/Services/LiveProcessor.cs
+++ b/src/Yavsc.Server/Services/LiveProcessor.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.Collections.Concurrent;
 using System.Net.WebSockets;
 using Yavsc.Models;
diff --git a/src/Yavsc.Server/Services/MailSender.cs b/src/Yavsc.Server/Services/MailSender.cs
index 592a43ba6..81518eddb 100644
--- a/src/Yavsc.Server/Services/MailSender.cs
+++ b/src/Yavsc.Server/Services/MailSender.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using MailKit.Net.Smtp;
 using MailKit.Security;
 using Microsoft.Extensions.Logging;
diff --git a/src/Yavsc.Server/Services/PermissionHandler.cs b/src/Yavsc.Server/Services/PermissionHandler.cs
index 6848070ac..77ee9fd57 100644
--- a/src/Yavsc.Server/Services/PermissionHandler.cs
+++ b/src/Yavsc.Server/Services/PermissionHandler.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.Security.Claims;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
diff --git a/src/Yavsc.Server/Services/ProfileService.cs b/src/Yavsc.Server/Services/ProfileService.cs
index b6da3a568..3b7b5121a 100644
--- a/src/Yavsc.Server/Services/ProfileService.cs
+++ b/src/Yavsc.Server/Services/ProfileService.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.Security.Claims;
 using IdentityModel;
 using IdentityServer8.Models;
diff --git a/src/Yavsc.Server/Settings/SiteSettings.cs b/src/Yavsc.Server/Settings/SiteSettings.cs
index ef74781de..3d604f79f 100644
--- a/src/Yavsc.Server/Settings/SiteSettings.cs
+++ b/src/Yavsc.Server/Settings/SiteSettings.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using Yavsc.Models.Relationship;
 
 namespace Yavsc
diff --git a/src/Yavsc.Server/ViewModels/Account/ForgotPasswordViewModel.cs b/src/Yavsc.Server/ViewModels/Account/ForgotPasswordViewModel.cs
index 6af77fe4d..903d4c8b3 100644
--- a/src/Yavsc.Server/ViewModels/Account/ForgotPasswordViewModel.cs
+++ b/src/Yavsc.Server/ViewModels/Account/ForgotPasswordViewModel.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 
 using System.ComponentModel.DataAnnotations;
 
diff --git a/src/Yavsc.Server/ViewModels/Account/SignInModel.cs b/src/Yavsc.Server/ViewModels/Account/SignInModel.cs
old mode 100755
new mode 100644
index d2aa69ad2..6375c40fe
--- a/src/Yavsc.Server/ViewModels/Account/SignInModel.cs
+++ b/src/Yavsc.Server/ViewModels/Account/SignInModel.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.ComponentModel.DataAnnotations;
 
 namespace Yavsc.ViewModels.Account
diff --git a/src/Yavsc.Server/ViewModels/Account/UnregisterViewModel.cs b/src/Yavsc.Server/ViewModels/Account/UnregisterViewModel.cs
index e28fcfed8..e08330440 100644
--- a/src/Yavsc.Server/ViewModels/Account/UnregisterViewModel.cs
+++ b/src/Yavsc.Server/ViewModels/Account/UnregisterViewModel.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.ComponentModel.DataAnnotations;
 
 namespace Yavsc.ViewModels.Account
diff --git a/src/Yavsc.Server/ViewModels/Account/VerifyCodeViewModel.cs b/src/Yavsc.Server/ViewModels/Account/VerifyCodeViewModel.cs
index a768e249f..5252ff4f6 100644
--- a/src/Yavsc.Server/ViewModels/Account/VerifyCodeViewModel.cs
+++ b/src/Yavsc.Server/ViewModels/Account/VerifyCodeViewModel.cs
@@ -1,3 +1,5 @@
+#nullable enable annotations
+
 using System.ComponentModel.DataAnnotations;
 
 namespace Yavsc.ViewModels.Account