diff --git a/src/design/App.Android/MainActivity.cs b/src/design/App.Android/MainActivity.cs
index a8355c477..e6c8a8580 100644
--- a/src/design/App.Android/MainActivity.cs
+++ b/src/design/App.Android/MainActivity.cs
@@ -140,16 +140,45 @@ public override bool DispatchKeyEvent(KeyEvent? e)
     {
         if (e?.KeyCode == Keycode.Back)
         {
-            if (e.Action == KeyEventActions.Down && CanHandleShellBack())
+            // REGRESSION HOTSPOT (see PlatformBackRegressionTests in App.Test.Integration).
+            //
+            // Previous implementation consumed Down only when CanHandleShellBack() was true
+            // and Up only when TryHandleShellBack() succeeded. If app state changed between
+            // Down and Up (modal closing itself, async navigation), Android received an
+            // orphan Up (or a swallowed Down) and the back button silently stopped working.
+            //
+            // Deterministic contract: ALWAYS consume both Back events here. On Up, route
+            // to the in-app back ladder; if the app is at a root screen, perform the
+            // platform default (finish/minimize) ourselves via OnBackPressed.
+            if (e.Action == KeyEventActions.Down)
                 return true;
 
-            if (e.Action == KeyEventActions.Up && TryHandleShellBack())
+            if (e.Action == KeyEventActions.Up)
+            {
+                if (!TryHandleShellBack())
+                {
+                    _handlingPlatformBack = true;
+                    try
+                    {
+                        base.OnBackPressed();
+                    }
+                    finally
+                    {
+                        _handlingPlatformBack = false;
+                    }
+                }
+
                 return true;
+            }
         }
 
         return base.DispatchKeyEvent(e);
     }
 
+    /// <summary>
+    /// Gesture-navigation / predictive-back path (no key events are dispatched).
+    /// Mirrors DispatchKeyEvent: in-app back first, platform default otherwise.
+    /// </summary>
     public override void OnBackPressed()
     {
         if (_handlingPlatformBack)
@@ -162,16 +191,14 @@ public override void OnBackPressed()
             return;
 
         _handlingPlatformBack = true;
-        base.OnBackPressed();
-        _handlingPlatformBack = false;
-    }
-
-    private static bool CanHandleShellBack()
-    {
-        if (Dispatcher.UIThread.CheckAccess())
-            return ShellService.CanHandlePlatformBack();
-
-        return Dispatcher.UIThread.InvokeAsync(ShellService.CanHandlePlatformBack).GetAwaiter().GetResult();
+        try
+        {
+            base.OnBackPressed();
+        }
+        finally
+        {
+            _handlingPlatformBack = false;
+        }
     }
 
     private static bool TryHandleShellBack()
diff --git a/src/design/App.Test.Integration/LayoutRegression/LayoutAsserts.cs b/src/design/App.Test.Integration/LayoutRegression/LayoutAsserts.cs
index b2b946671..13ad224e2 100644
--- a/src/design/App.Test.Integration/LayoutRegression/LayoutAsserts.cs
+++ b/src/design/App.Test.Integration/LayoutRegression/LayoutAsserts.cs
@@ -136,9 +136,22 @@ private static bool CellsIntersect(Control a, Control b)
         return aCol <= bColEnd && bCol <= aColEnd && aRow <= bRowEnd && bRow <= aRowEnd;
     }
 
-    /// <summary>Translate a control's bounds into root coordinates (handles render transforms).</summary>
+    /// <summary>
+    /// Translate a control's layout bounds into root coordinates.
+    /// The element's own render transform is deliberately excluded: render transforms
+    /// (e.g. an infinite spinner's RotateTransform) animate the visual without moving
+    /// its layout slot, so including them makes results depend on which animation
+    /// frame the layout pass happens to catch — a source of flaky false positives.
+    /// Ancestor transforms still apply via the parent's translation.
+    /// </summary>
     private static Rect ToRootRect(Visual v, Visual root)
     {
+        if (!ReferenceEquals(v, root) && v.GetVisualParent() is Visual parent &&
+            parent.TranslatePoint(v.Bounds.Position, root) is { } layoutOrigin)
+        {
+            return new Rect(layoutOrigin, v.Bounds.Size);
+        }
+
         var origin = v.TranslatePoint(default, root) ?? default;
         return new Rect(origin, v.Bounds.Size);
     }
diff --git a/src/design/App.Test.Integration/LayoutRegression/LayoutRegressionTests.cs b/src/design/App.Test.Integration/LayoutRegression/LayoutRegressionTests.cs
index 77e487720..dfb5af8e0 100644
--- a/src/design/App.Test.Integration/LayoutRegression/LayoutRegressionTests.cs
+++ b/src/design/App.Test.Integration/LayoutRegression/LayoutRegressionTests.cs
@@ -12,6 +12,9 @@
 using App.UI.Sections.Portfolio;
 using App.UI.Sections.Settings;
 using App.UI.Shared;
+using App.UI.Shared.PaymentFlow;
+using App.UI.Shared.Services;
+using Angor.Sdk.Common;
 using App.UI.Shared.Controls;
 using Microsoft.Extensions.DependencyInjection;
 using System.Collections.ObjectModel;
@@ -326,16 +329,19 @@ public void SettingsView_has_no_overlaps_or_overflow(double width, double height
     // CreateProjectView — all 6 wizard steps at phone + desktop widths
     // ═══════════════════════════════════════════════════════════════════
 
-    public static TheoryData<int, double> CreateProjectSteps
+    public static TheoryData<string, int, double> CreateProjectSteps
     {
         get
         {
-            var data = new TheoryData<int, double>();
-            for (int step = 1; step <= 6; step++)
+            var data = new TheoryData<string, int, double>();
+            foreach (var type in new[] { "fund", "investment", "subscription" })
             {
-                data.Add(step, 360);
-                data.Add(step, 768);
-                data.Add(step, 1280);
+                for (int step = 1; step <= 6; step++)
+                {
+                    data.Add(type, step, 360);
+                    data.Add(type, step, 768);
+                    data.Add(type, step, 1280);
+                }
             }
 
             return data;
@@ -344,20 +350,125 @@ public static TheoryData<int, double> CreateProjectSteps
 
     [AvaloniaTheory]
     [MemberData(nameof(CreateProjectSteps))]
-    public void CreateProjectView_step_has_no_overlaps_or_overflow(int step, double width)
+    public void CreateProjectView_step_has_no_overlaps_or_overflow(string projectType, int step, double width)
     {
         var vm = global::App.App.Services.GetRequiredService<CreateProjectViewModel>();
-        vm.SelectProjectType("fund");
+        vm.SelectProjectType(projectType);
         vm.ProjectName = "A Very Long Project Name That Stresses The Wizard Header Layout";
         vm.ProjectAbout = new string('x', 240);
         vm.GoToStep(step);
+        // Step 5 shows an interstitial welcome by default — the real form (presets,
+        // duration inputs, advanced editor) is what must be layout-audited.
+        vm.ShowStep5Welcome = false;
 
         var view = new CreateProjectView { DataContext = vm };
 
         var violations = RenderAndAudit(view, width, 900);
 
         violations.Should().BeEmpty(
-            $"CreateProjectView step {step} must not have overlapping/overflowing elements at width {width}:\n" +
+            $"CreateProjectView ({projectType}) step {step} must not have overlapping/overflowing elements at width {width}:\n" +
+            string.Join("\n", violations));
+    }
+
+    // ═══════════════════════════════════════════════════════════════════
+    // PaymentFlowView — "Use an existing wallet" modal (issue #920:
+    // Fund Deployment label overlapped by the amount; wallet card cramping)
+    // ═══════════════════════════════════════════════════════════════════
+
+    [AvaloniaTheory]
+    [MemberData(nameof(Viewports))]
+    public void PaymentFlowView_wallet_selector_has_no_overlaps_or_overflow(double width, double height)
+    {
+        var services = global::App.App.Services;
+        var config = new PaymentFlowConfig
+        {
+            AmountSats = 100_000_000, // 1.00000000 — worst-case width amount
+            Title = "Fund Deployment",
+            SuccessTitle = "Deployed",
+            SuccessButtonText = "Go to My Projects",
+            OnSuccessButtonClicked = () => { },
+            OnPaymentReceived = (_, _, _) => Task.FromResult(CSharpFunctionalExtensions.Result.Success()),
+        };
+        var logger = services.GetRequiredService<Microsoft.Extensions.Logging.ILoggerFactory>()
+            .CreateLogger("PaymentFlowLayoutTest");
+        var vm = ActivatorUtilities.CreateInstance<PaymentFlowViewModel>(
+            services, config, logger);
+
+        var view = new PaymentFlowView { DataContext = vm };
+
+        // Wallet context is empty in tests: exercise the wallet-card template with
+        // worst-case fabricated wallets (long name, long balance, pending balance).
+        var w1 = new WalletInfo(
+            new WalletId("test-1"),
+            "A Very Long Wallet Name That Must Not Overlap The Balance", "TBTC")
+        {
+            TotalBalanceSats = 123_456_789,
+            UnconfirmedBalanceSats = 12_345_678,
+            IsSelected = true,
+        };
+        var w2 = new WalletInfo(
+            new WalletId("test-2"), "Angor Wallet", "TBTC")
+        {
+            TotalBalanceSats = 0,
+        };
+        view.AttachedToVisualTree += (_, _) =>
+        {
+            if (view.FindControl<ItemsControl>("WalletsList") is { } list)
+                list.ItemsSource = new[] { w1, w2 };
+        };
+
+        var violations = RenderAndAudit(view, width, height);
+
+        violations.Should().BeEmpty(
+            $"PaymentFlowView must not have overlapping/overflowing elements at {width}x{height}:\n" +
+            string.Join("\n", violations));
+    }
+
+    // ═══════════════════════════════════════════════════════════════════
+    // InvestorBreakdownView — optimistic-loading modal (table→cards on mobile)
+    // ═══════════════════════════════════════════════════════════════════
+
+    [AvaloniaTheory]
+    [MemberData(nameof(Viewports))]
+    public void InvestorBreakdownView_has_no_overlaps_or_overflow(double width, double height)
+    {
+        var vm = new InvestorBreakdownViewModel(
+            "A Very Long Project Name That Stresses The Modal Header Layout",
+            "fund", "TBTC",
+            "aaaa000000000000000000000000000000000000000000000000000000000000");
+
+        // Worst-case rows: current-user highlight + long amounts.
+        var rows = new System.Collections.Generic.List<Angor.Sdk.Funding.Projects.Dtos.InvestorShareDto>();
+        for (int i = 0; i < 6; i++)
+        {
+            rows.Add(new Angor.Sdk.Funding.Projects.Dtos.InvestorShareDto(
+                i == 2
+                    ? "aaaa000000000000000000000000000000000000000000000000000000000000"
+                    : $"bbbb{i:D60}",
+                "", 123_456_789, 33.33, 12_345_678, 10.01));
+        }
+        vm.ApplyData(new Angor.Sdk.Funding.Projects.Operations.GetInvestorShares.GetInvestorSharesResponse(
+            370_370_367, rows.Count, rows));
+
+        var view = new InvestorBreakdownView { DataContext = vm };
+        var violations = RenderAndAudit(view, width, height);
+
+        violations.Should().BeEmpty(
+            $"InvestorBreakdownView must not have overlapping/overflowing elements at {width}x{height}:\n" +
+            string.Join("\n", violations));
+    }
+
+    [AvaloniaTheory]
+    [MemberData(nameof(Viewports))]
+    public void InvestorBreakdownView_loading_state_has_no_overlaps_or_overflow(double width, double height)
+    {
+        var vm = new InvestorBreakdownViewModel("Project", "fund", "TBTC");
+
+        var view = new InvestorBreakdownView { DataContext = vm };
+        var violations = RenderAndAudit(view, width, height);
+
+        violations.Should().BeEmpty(
+            $"InvestorBreakdownView (loading) must not have overlapping/overflowing elements at {width}x{height}:\n" +
             string.Join("\n", violations));
     }
 
diff --git a/src/design/App.Test.Integration/PlatformBackRegressionTests.cs b/src/design/App.Test.Integration/PlatformBackRegressionTests.cs
new file mode 100644
index 000000000..c3c868709
--- /dev/null
+++ b/src/design/App.Test.Integration/PlatformBackRegressionTests.cs
@@ -0,0 +1,271 @@
+using Avalonia.Controls;
+using Avalonia.Headless.XUnit;
+using FluentAssertions;
+using App.UI.Sections.FindProjects;
+using App.UI.Sections.MyProjects;
+using App.UI.Sections.Portfolio;
+using App.UI.Shell;
+using Microsoft.Extensions.DependencyInjection;
+using System.Collections.ObjectModel;
+using Xunit;
+
+namespace App.Test.Integration;
+
+/// <summary>
+/// Regression tests for the Android physical/system back button routing.
+///
+/// The physical back button has repeatedly broken (commits 39350f93, 0300e890,
+/// 79bc736b, plus follow-up touches) because the shell derives "can go back"
+/// from booleans reverse-engineered out of the string-keyed view cache
+/// (SyncDetailStateFromCachedViews) and a hand-maintained priority ladder
+/// (TryHandlePlatformBack). Any new overlay/detail screen — or a renamed nav
+/// label — silently breaks back navigation.
+///
+/// These tests exercise the exact ShellViewModel entry points MainActivity
+/// calls (CanHandlePlatformBack / TryHandlePlatformBack) headlessly, for every
+/// state in the ladder and for the priority ordering between them. If you add
+/// a new overlay/detail surface, add a case here.
+/// </summary>
+public class PlatformBackRegressionTests
+{
+    private static ShellViewModel GetShell()
+    {
+        var shell = global::App.App.Services.GetRequiredService<ShellViewModel>();
+        // Make sure the section views the back ladder inspects exist in the cache,
+        // exactly as they would after real navigation. These keys are load-bearing:
+        // SyncDetailStateFromCachedViews pattern-matches on them. If a nav label is
+        // renamed without updating the back ladder, these tests fail loudly instead
+        // of the back button silently dying on device.
+        shell.EnsureViewCreated("Find Projects");
+        shell.EnsureViewCreated("Funded");
+        shell.EnsureViewCreated("My Projects");
+        return shell;
+    }
+
+    private static FindProjectsViewModel FindProjectsVm(ShellViewModel shell) =>
+        (FindProjectsViewModel)((Control)shell.ViewCache["Find Projects"]).DataContext!;
+
+    private static MyProjectsViewModel MyProjectsVm(ShellViewModel shell) =>
+        (MyProjectsViewModel)((Control)shell.ViewCache["My Projects"]).DataContext!;
+
+    private static PortfolioViewModel PortfolioVm() =>
+        global::App.App.Services.GetRequiredService<PortfolioViewModel>();
+
+    /// <summary>Returns the shell to a root state so tests can't leak into each other.</summary>
+    private static void ResetToRoot(ShellViewModel shell)
+    {
+        shell.HideModal();
+        FindProjectsVm(shell).CloseInvestPage();
+        FindProjectsVm(shell).CloseProjectDetail();
+        PortfolioVm().CloseInvestmentDetail();
+        var mp = MyProjectsVm(shell);
+        mp.CancelCreateWizard();
+        mp.CloseEditProfile();
+        mp.CloseManageProject();
+        shell.SyncDetailStateFromCachedViews();
+    }
+
+    // ─────────────────────────────────────────────────────────────────────
+    // Root state
+    // ─────────────────────────────────────────────────────────────────────
+
+    [AvaloniaFact]
+    public void At_root_back_is_not_handled_so_android_may_exit()
+    {
+        var shell = GetShell();
+        ResetToRoot(shell);
+
+        shell.CanHandlePlatformBack().Should().BeFalse();
+        shell.TryHandlePlatformBack().Should().BeFalse();
+    }
+
+    // ─────────────────────────────────────────────────────────────────────
+    // Modal
+    // ─────────────────────────────────────────────────────────────────────
+
+    [AvaloniaFact]
+    public void Back_closes_open_modal()
+    {
+        var shell = GetShell();
+        ResetToRoot(shell);
+        try
+        {
+            shell.ShowModal(new TextBlock { Text = "modal" });
+
+            shell.CanHandlePlatformBack().Should().BeTrue();
+            shell.TryHandlePlatformBack().Should().BeTrue();
+            shell.IsModalOpen.Should().BeFalse("back must close the modal");
+            shell.TryHandlePlatformBack().Should().BeFalse("second back is at root again");
+        }
+        finally
+        {
+            ResetToRoot(shell);
+        }
+    }
+
+    [AvaloniaFact]
+    public void Modal_wins_over_open_project_detail()
+    {
+        var shell = GetShell();
+        ResetToRoot(shell);
+        try
+        {
+            FindProjectsVm(shell).OpenProjectDetail(new ProjectItemViewModel { ProjectName = "P" });
+            shell.ShowModal(new TextBlock { Text = "modal" });
+
+            shell.TryHandlePlatformBack().Should().BeTrue();
+            shell.IsModalOpen.Should().BeFalse("first back closes the modal, not the detail");
+            FindProjectsVm(shell).SelectedProject.Should().NotBeNull("detail must survive the modal close");
+
+            shell.TryHandlePlatformBack().Should().BeTrue();
+            FindProjectsVm(shell).SelectedProject.Should().BeNull("second back closes the detail");
+        }
+        finally
+        {
+            ResetToRoot(shell);
+        }
+    }
+
+    // ─────────────────────────────────────────────────────────────────────
+    // Investor detail flow
+    // ─────────────────────────────────────────────────────────────────────
+
+    [AvaloniaFact]
+    public void Back_closes_project_detail()
+    {
+        var shell = GetShell();
+        ResetToRoot(shell);
+        try
+        {
+            FindProjectsVm(shell).OpenProjectDetail(new ProjectItemViewModel { ProjectName = "P" });
+
+            shell.CanHandlePlatformBack().Should().BeTrue();
+            shell.TryHandlePlatformBack().Should().BeTrue();
+            FindProjectsVm(shell).SelectedProject.Should().BeNull();
+            shell.TryHandlePlatformBack().Should().BeFalse();
+        }
+        finally
+        {
+            ResetToRoot(shell);
+        }
+    }
+
+    [AvaloniaFact]
+    public void Back_closes_investment_detail()
+    {
+        var shell = GetShell();
+        ResetToRoot(shell);
+        try
+        {
+            PortfolioVm().OpenInvestmentDetail(new InvestmentViewModel
+            {
+                ProjectName = "P",
+                Stages = new ObservableCollection<InvestmentStageViewModel>(),
+            });
+
+            shell.CanHandlePlatformBack().Should().BeTrue();
+            shell.TryHandlePlatformBack().Should().BeTrue();
+            PortfolioVm().SelectedInvestment.Should().BeNull();
+            shell.TryHandlePlatformBack().Should().BeFalse();
+        }
+        finally
+        {
+            ResetToRoot(shell);
+        }
+    }
+
+    // ─────────────────────────────────────────────────────────────────────
+    // Founder create-wizard flow
+    // ─────────────────────────────────────────────────────────────────────
+
+    [AvaloniaFact]
+    public void Back_steps_back_through_create_wizard_then_closes_it()
+    {
+        var shell = GetShell();
+        ResetToRoot(shell);
+        try
+        {
+            var mp = MyProjectsVm(shell);
+            mp.LaunchCreateWizard();
+            mp.CreateProjectVm.MaxStepReached = 3; // GoToStep is clamped to MaxStepReached
+            mp.CreateProjectVm.GoToStep(3);
+
+            shell.CanHandlePlatformBack().Should().BeTrue();
+
+            shell.TryHandlePlatformBack().Should().BeTrue();
+            mp.CreateProjectVm.CurrentStep.Should().Be(2, "back must step the wizard back, not close it");
+            mp.ShowCreateWizard.Should().BeTrue();
+
+            shell.TryHandlePlatformBack().Should().BeTrue();
+            mp.CreateProjectVm.CurrentStep.Should().Be(1);
+            mp.ShowCreateWizard.Should().BeTrue();
+
+            shell.TryHandlePlatformBack().Should().BeTrue();
+            mp.ShowCreateWizard.Should().BeFalse("back at step 1 closes the wizard");
+
+            shell.TryHandlePlatformBack().Should().BeFalse();
+        }
+        finally
+        {
+            ResetToRoot(shell);
+        }
+    }
+
+    // ─────────────────────────────────────────────────────────────────────
+    // Founder edit-profile flow
+    // ─────────────────────────────────────────────────────────────────────
+
+    [AvaloniaFact]
+    public void Back_closes_edit_profile()
+    {
+        var shell = GetShell();
+        ResetToRoot(shell);
+        try
+        {
+            MyProjectsVm(shell).OpenEditProfile(new MyProjectItemViewModel
+            {
+                Name = "P",
+                ProjectType = "fund",
+                ProjectIdentifier = "angor1qtest000000000000000000000000000000000",
+            });
+
+            shell.CanHandlePlatformBack().Should().BeTrue();
+            shell.TryHandlePlatformBack().Should().BeTrue();
+            MyProjectsVm(shell).SelectedEditProject.Should().BeNull();
+            shell.TryHandlePlatformBack().Should().BeFalse();
+        }
+        finally
+        {
+            ResetToRoot(shell);
+        }
+    }
+
+    // ─────────────────────────────────────────────────────────────────────
+    // Founder manage-funds flow
+    // ─────────────────────────────────────────────────────────────────────
+
+    [AvaloniaFact]
+    public void Back_closes_manage_funds()
+    {
+        var shell = GetShell();
+        ResetToRoot(shell);
+        try
+        {
+            MyProjectsVm(shell).OpenManageProject(new MyProjectItemViewModel
+            {
+                Name = "P",
+                ProjectType = "fund",
+                ProjectIdentifier = "angor1qtest000000000000000000000000000000000",
+            });
+
+            shell.CanHandlePlatformBack().Should().BeTrue();
+            shell.TryHandlePlatformBack().Should().BeTrue();
+            MyProjectsVm(shell).SelectedManageProject.Should().BeNull();
+            shell.TryHandlePlatformBack().Should().BeFalse();
+        }
+        finally
+        {
+            ResetToRoot(shell);
+        }
+    }
+}
diff --git a/src/design/App/UI/Sections/MyProjects/Steps/CreateProjectStep4View.axaml b/src/design/App/UI/Sections/MyProjects/Steps/CreateProjectStep4View.axaml
index e8741e287..85ca0ae2a 100644
--- a/src/design/App/UI/Sections/MyProjects/Steps/CreateProjectStep4View.axaml
+++ b/src/design/App/UI/Sections/MyProjects/Steps/CreateProjectStep4View.axaml
@@ -101,9 +101,9 @@
                                 </Border>
                             </StackPanel>
                         </Border>
-                        <Grid ColumnDefinitions="*,24,*" Margin="24">
+                        <Grid Name="FundraisingDatesGrid" ColumnDefinitions="*,24,*" RowDefinitions="Auto,Auto" Margin="24">
                             <!-- Start Date -->
-                            <StackPanel Grid.Column="0" Spacing="8">
+                            <StackPanel Name="StartDatePanel" Grid.Column="0" Grid.Row="0" Spacing="8">
                                 <TextBlock Text="Start Date" FontSize="14" FontWeight="Bold"
                                            Foreground="{DynamicResource TextStrong}" />
                                 <CalendarDatePicker Name="InvestStartDatePicker"
@@ -115,7 +115,7 @@
                             </StackPanel>
 
                             <!-- End Date -->
-                            <StackPanel Grid.Column="2" Spacing="8">
+                            <StackPanel Name="EndDatePanel" Grid.Column="2" Grid.Row="0" Spacing="8">
                                 <TextBlock Text="End Date *" FontSize="14" FontWeight="Bold"
                                            Foreground="{DynamicResource TextStrong}" />
                                 <CalendarDatePicker Name="InvestEndDatePicker"
diff --git a/src/design/App/UI/Sections/MyProjects/Steps/CreateProjectStep4View.axaml.cs b/src/design/App/UI/Sections/MyProjects/Steps/CreateProjectStep4View.axaml.cs
index 22565eef6..fde71d33d 100644
--- a/src/design/App/UI/Sections/MyProjects/Steps/CreateProjectStep4View.axaml.cs
+++ b/src/design/App/UI/Sections/MyProjects/Steps/CreateProjectStep4View.axaml.cs
@@ -1,5 +1,8 @@
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.LogicalTree;
+using App.UI.Shared;
 
 namespace App.UI.Sections.MyProjects.Steps;
 
@@ -11,15 +14,71 @@ public partial class CreateProjectStep4View : UserControl
     private ListBox? _subPricePresets;
     private ListBox? _durationPresets;
 
+    // Responsive layout — Fundraising Window dates stack on compact (issue #920)
+    private Grid? _fundraisingDatesGrid;
+    private StackPanel? _startDatePanel;
+    private StackPanel? _endDatePanel;
+    private IDisposable? _layoutSubscription;
+
     public CreateProjectStep4View()
     {
         InitializeComponent();
+        SubscribeToLayoutMode();
     }
 
     protected override void OnLoaded(RoutedEventArgs e)
     {
         base.OnLoaded(e);
         ResolveNamedElements();
+        ApplyResponsiveLayout(LayoutModeService.Instance.IsCompact);
+    }
+
+    /// <summary>Idempotent responsive-layout subscription — re-created on every logical-tree attach because OnDetachedFromLogicalTree disposes it (views are cached and re-attached on section switches).</summary>
+    private void SubscribeToLayoutMode()
+    {
+        if (_layoutSubscription != null) return;
+        _layoutSubscription = LayoutModeService.Instance
+            .WhenAnyValue(x => x.IsCompact)
+            .Subscribe(ApplyResponsiveLayout);
+    }
+
+    protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
+    {
+        base.OnAttachedToLogicalTree(e);
+        SubscribeToLayoutMode();
+    }
+
+    protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
+    {
+        _layoutSubscription?.Dispose();
+        _layoutSubscription = null;
+        base.OnDetachedFromLogicalTree(e);
+    }
+
+    /// <summary>
+    /// Compact: Start/End date columns stack into one column so the pickers and
+    /// the month-preset buttons get the full card width (issue #920).
+    /// </summary>
+    private void ApplyResponsiveLayout(bool isCompact)
+    {
+        if (_fundraisingDatesGrid == null || _startDatePanel == null || _endDatePanel == null) return;
+
+        if (isCompact)
+        {
+            _fundraisingDatesGrid.ColumnDefinitions[1].Width = new GridLength(0);
+            _fundraisingDatesGrid.ColumnDefinitions[2].Width = new GridLength(0);
+            Grid.SetColumn(_endDatePanel, 0);
+            Grid.SetRow(_endDatePanel, 1);
+            _endDatePanel.Margin = new Thickness(0, 20, 0, 0);
+        }
+        else
+        {
+            _fundraisingDatesGrid.ColumnDefinitions[1].Width = new GridLength(24);
+            _fundraisingDatesGrid.ColumnDefinitions[2].Width = GridLength.Star;
+            Grid.SetColumn(_endDatePanel, 2);
+            Grid.SetRow(_endDatePanel, 0);
+            _endDatePanel.Margin = new Thickness(0);
+        }
     }
 
     private CreateProjectViewModel? Vm => DataContext as CreateProjectViewModel;
@@ -30,6 +89,9 @@ private void ResolveNamedElements()
         _fundAmountPresets = this.FindControl<ListBox>("FundAmountPresets");
         _subPricePresets = this.FindControl<ListBox>("SubPricePresets");
         _durationPresets = this.FindControl<ListBox>("DurationPresets");
+        _fundraisingDatesGrid = this.FindControl<Grid>("FundraisingDatesGrid");
+        _startDatePanel = this.FindControl<StackPanel>("StartDatePanel");
+        _endDatePanel = this.FindControl<StackPanel>("EndDatePanel");
 
         if (_investAmountPresets != null)
             _investAmountPresets.SelectionChanged += (_, _) => OnAmountPresetSelected(_investAmountPresets);
diff --git a/src/design/App/UI/Sections/MyProjects/Steps/CreateProjectStep5View.axaml b/src/design/App/UI/Sections/MyProjects/Steps/CreateProjectStep5View.axaml
index 31f1f147c..f58bcb266 100644
--- a/src/design/App/UI/Sections/MyProjects/Steps/CreateProjectStep5View.axaml
+++ b/src/design/App/UI/Sections/MyProjects/Steps/CreateProjectStep5View.axaml
@@ -3,6 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:mp="clr-namespace:App.UI.Sections.MyProjects"
+             xmlns:ctrl="clr-namespace:App.UI.Shared.Controls"
              xmlns:i="https://github.com/projektanker/icons.avalonia"
              mc:Ignorable="d" d:DesignWidth="680" d:DesignHeight="1200"
              x:Class="App.UI.Sections.MyProjects.Steps.CreateProjectStep5View"
@@ -76,6 +77,14 @@
             <Setter Property="Background" Value="Transparent" />
             <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
             <Setter Property="Foreground" Value="{DynamicResource TextStrong}" />
+            <!-- Standard preset-pill height (matches ButtonizedListBoxItem pills) -->
+            <Setter Property="MinHeight" Value="60" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+        </Style>
+
+        <!-- Row-level delete: borderless, red-tint hover (house RemoveBtn pattern) -->
+        <Style Selector="Button.RemoveStageBtn:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Background" Value="{DynamicResource ErrorSoft}" />
         </Style>
         <Style Selector="Button.DurPresetBtn:pointerover /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Background" Value="{DynamicResource SurfaceLow}" />
@@ -165,16 +174,20 @@
                             <TextBlock Text="Project Length" FontSize="14" FontWeight="Bold"
                                        Foreground="{DynamicResource TextStrong}" />
 
-                            <!-- Duration input + unit dropdown — Vue: flex gap-2, input w-1/2 + select w-1/2 -->
+                            <!-- Duration input + unit dropdown — Vue: flex gap-2, input w-1/2 + select w-1/2.
+                                 Both use the same fixed MinHeight so they always align. -->
                             <Grid ColumnDefinitions="*,*" HorizontalAlignment="Stretch">
                                 <TextBox Name="DurationValueInput"
                                          Text="{Binding DurationValue, Mode=TwoWay}"
                                          Watermark="0"
-                                         FontSize="16" Padding="12,12,16,12" CornerRadius="8" />
+                                         MinHeight="52" VerticalContentAlignment="Center"
+                                         FontSize="16" Padding="12,0,16,0" CornerRadius="8" />
                                 <ComboBox Name="DurationUnitCombo" Grid.Column="1" Margin="8,0,0,0"
                                           ItemsSource="{Binding DurationUnitOptions}"
                                           SelectedItem="{Binding DurationUnit, Mode=TwoWay}"
-                                          FontSize="16" Padding="12" CornerRadius="8"
+                                          MinHeight="52" VerticalContentAlignment="Center"
+                                          VerticalAlignment="Stretch"
+                                          FontSize="16" Padding="12,0,16,0" CornerRadius="8"
                                           HorizontalAlignment="Stretch" />
                             </Grid>
 
@@ -183,15 +196,16 @@
                             <ItemsControl Name="InvestDurationPresets" ItemsSource="{Binding DurationPresetItems}">
                                 <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>
-                                        <WrapPanel Orientation="Horizontal" />
+                                        <!-- Balanced rows dividing the full width: 5 → 3+2, 6 → 3+3 -->
+                                        <ctrl:BalancedWrapPanel MaxPerRow="3" ColumnSpacing="8" RowSpacing="8" />
                                     </ItemsPanelTemplate>
                                 </ItemsControl.ItemsPanel>
                                 <ItemsControl.ItemTemplate>
                                     <DataTemplate x:DataType="mp:DurationPresetItem">
                                         <Button Classes="DurPresetBtn"
-                                                Margin="0,0,8,8"
                                                 Padding="16,10" CornerRadius="8"
                                                 BorderThickness="2"
+                                                HorizontalAlignment="Stretch"
                                                 HorizontalContentAlignment="Center"
                                                 FontSize="13" FontWeight="Bold"
                                                 Tag="{Binding}"
@@ -533,7 +547,9 @@
                                     BorderBrush="{DynamicResource Stroke}" BorderThickness="1"
                                     Background="{DynamicResource SurfaceHover}">
                                 <StackPanel>
-                                    <Grid ColumnDefinitions="Auto,*,*,Auto" ColumnSpacing="12" Margin="14,12,14,12">
+                                    <!-- Fields stacked in one column (issue #920: side-by-side
+                                         columns squeezed the Release Date picker on mobile) -->
+                                    <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="12" Margin="14,12,14,12">
                                         <!-- Stage number badge -->
                                         <Border Grid.Column="0" Width="36" Height="36" CornerRadius="18"
                                                 Background="{DynamicResource Accent}" VerticalAlignment="Top" Margin="0,4,0,0">
@@ -542,40 +558,45 @@
                                                        HorizontalAlignment="Center" VerticalAlignment="Center" />
                                         </Border>
 
-                                        <!-- Percentage — NumericUpDown bound to decimal? bridge (avoids double↔decimal? mismatch) -->
-                                        <StackPanel Grid.Column="1" Spacing="4">
-                                            <TextBlock Text="Percentage %" FontSize="11" FontWeight="SemiBold"
-                                                       Foreground="{DynamicResource TextMuted}" />
-                                            <NumericUpDown Value="{Binding PercentageDecimal, Mode=TwoWay}"
-                                                           Minimum="0" Maximum="100"
-                                                           Increment="1" FormatString="0"
-                                                           FontSize="14" />
-                                            <TextBlock Text="Must be greater than 0" FontSize="11"
-                                                       Foreground="#ef4444"
-                                                       IsVisible="{Binding HasPercentageError}" />
-                                        </StackPanel>
-
-                                        <!-- Release date picker + inline error -->
-                                        <StackPanel Grid.Column="2" Spacing="4">
-                                            <TextBlock Text="Release Date" FontSize="11" FontWeight="SemiBold"
-                                                       Foreground="{DynamicResource TextMuted}" />
-                                            <CalendarDatePicker
-                                                SelectedDate="{Binding ReleaseDateAsDateTime, Mode=TwoWay}"
-                                                FontSize="14" HorizontalAlignment="Stretch" />
-                                            <TextBlock Text="{Binding ReleaseDateError}" FontSize="11"
-                                                       Foreground="#ef4444" TextWrapping="Wrap"
-                                                       IsVisible="{Binding HasDateError}" />
+                                        <StackPanel Grid.Column="1" Spacing="10">
+                                            <!-- Percentage — NumericUpDown bound to decimal? bridge (avoids double↔decimal? mismatch) -->
+                                            <StackPanel Spacing="4">
+                                                <TextBlock Text="Percentage %" FontSize="11" FontWeight="SemiBold"
+                                                           Foreground="{DynamicResource TextMuted}" />
+                                                <NumericUpDown Value="{Binding PercentageDecimal, Mode=TwoWay}"
+                                                               Minimum="0" Maximum="100"
+                                                               Increment="1" FormatString="0"
+                                                               FontSize="14" />
+                                                <TextBlock Text="Must be greater than 0" FontSize="11"
+                                                           Foreground="#ef4444"
+                                                           IsVisible="{Binding HasPercentageError}" />
+                                            </StackPanel>
+
+                                            <!-- Release date picker + inline error -->
+                                            <StackPanel Spacing="4">
+                                                <TextBlock Text="Release Date" FontSize="11" FontWeight="SemiBold"
+                                                           Foreground="{DynamicResource TextMuted}" />
+                                                <CalendarDatePicker
+                                                    SelectedDate="{Binding ReleaseDateAsDateTime, Mode=TwoWay}"
+                                                    FontSize="14" HorizontalAlignment="Stretch" />
+                                                <TextBlock Text="{Binding ReleaseDateError}" FontSize="11"
+                                                           Foreground="#ef4444" TextWrapping="Wrap"
+                                                           IsVisible="{Binding HasDateError}" />
+                                            </StackPanel>
                                         </StackPanel>
 
                                         <!-- Remove button -->
-                                        <Button Grid.Column="3" Name="RemoveStageButton"
+                                        <!-- Row-level delete — house pattern (see EditProfileView
+                                             RemoveBtn): borderless icon button, red-tint hover -->
+                                        <Button Grid.Column="2" Name="RemoveStageButton"
                                                 Tag="{Binding}"
+                                                Classes="RemoveStageBtn"
                                                 Background="Transparent"
-                                                BorderBrush="{DynamicResource ErrorBannerBorder}" BorderThickness="1"
+                                                BorderThickness="0"
                                                 CornerRadius="8" Padding="10,8"
                                                 VerticalAlignment="Top" Margin="0,20,0,0">
                                             <i:Icon Value="fa-solid fa-trash" FontSize="14"
-                                                    Foreground="{DynamicResource ErrorBannerText}" />
+                                                    Foreground="{DynamicResource PillRedText}" />
                                         </Button>
                                     </Grid>
                                 </StackPanel>
@@ -589,23 +610,23 @@
                     <!-- Complete: green -->
                     <Border IsVisible="{Binding AdvancedEditorTotalIsComplete}"
                             Padding="12,10" CornerRadius="8"
-                            Background="#f0fdf4" BorderBrush="#86efac" BorderThickness="1">
+                            Background="{DynamicResource PillGreenBg}" BorderBrush="{DynamicResource PillGreenBorder}" BorderThickness="1">
                         <StackPanel Orientation="Horizontal" Spacing="8">
-                            <i:Icon Value="fa-solid fa-circle-check" FontSize="14" Foreground="#16a34a"
+                            <i:Icon Value="fa-solid fa-circle-check" FontSize="14" Foreground="{DynamicResource PillGreenText}"
                                     VerticalAlignment="Center" />
                             <TextBlock Text="{Binding AdvancedEditorTotalLabel}" FontSize="13" FontWeight="SemiBold"
-                                       Foreground="#16a34a" VerticalAlignment="Center" />
+                                       Foreground="{DynamicResource PillGreenText}" VerticalAlignment="Center" />
                         </StackPanel>
                     </Border>
                     <!-- Incomplete: amber -->
                     <Border IsVisible="{Binding AdvancedEditorTotalIsIncomplete}"
                             Padding="12,10" CornerRadius="8"
-                            Background="#fffbeb" BorderBrush="#fde68a" BorderThickness="1">
+                            Background="{DynamicResource PillAmberBg}" BorderBrush="{DynamicResource PillAmberBorder}" BorderThickness="1">
                         <StackPanel Orientation="Horizontal" Spacing="8">
-                            <i:Icon Value="fa-solid fa-circle-exclamation" FontSize="14" Foreground="#d97706"
+                            <i:Icon Value="fa-solid fa-circle-exclamation" FontSize="14" Foreground="{DynamicResource PillAmberText}"
                                     VerticalAlignment="Center" />
                             <TextBlock Text="{Binding AdvancedEditorTotalLabel}" FontSize="13" FontWeight="SemiBold"
-                                       Foreground="#d97706" VerticalAlignment="Center" />
+                                       Foreground="{DynamicResource PillAmberText}" VerticalAlignment="Center" />
                         </StackPanel>
                     </Border>
                 </Panel>
@@ -613,8 +634,10 @@
                 <!-- Add Stage button -->
                 <Button Name="AddStageButton" Margin="20,0,20,12"
                         HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+                        VerticalContentAlignment="Center"
                         Background="Transparent"
                         BorderBrush="{DynamicResource Stroke}" BorderThickness="1"
+                        MinHeight="52"
                         CornerRadius="10" Padding="16,12" FontSize="14"
                         Foreground="{DynamicResource TextMuted}">
                     <StackPanel Orientation="Horizontal" Spacing="8">
@@ -625,12 +648,12 @@
 
                 <!-- Stage guidelines: only shown when at least one stage has a date error -->
                 <Border Margin="20,0,20,16" Padding="12" CornerRadius="8"
-                        Background="#fffbeb" BorderBrush="#fde68a" BorderThickness="1"
+                        Background="{DynamicResource PillAmberBg}" BorderBrush="{DynamicResource PillAmberBorder}" BorderThickness="1"
                         IsVisible="{Binding HasAnyDateError}">
                     <StackPanel Orientation="Horizontal" Spacing="8">
-                        <i:Icon Value="fa-solid fa-triangle-exclamation" FontSize="14" Foreground="#d97706"
+                        <i:Icon Value="fa-solid fa-triangle-exclamation" FontSize="14" Foreground="{DynamicResource PillAmberText}"
                                 VerticalAlignment="Top" Margin="0,2,0,0" />
-                        <TextBlock FontSize="12" Foreground="#d97706" TextWrapping="Wrap"
+                        <TextBlock FontSize="12" Foreground="{DynamicResource PillAmberText}" TextWrapping="Wrap"
                                    Text="Each release date must be after the funding end date." />
                     </StackPanel>
                 </Border>
diff --git a/src/design/App/UI/Sections/MyProjects/Steps/CreateProjectStep5View.axaml.cs b/src/design/App/UI/Sections/MyProjects/Steps/CreateProjectStep5View.axaml.cs
index fe1c5117e..f5db88ac7 100644
--- a/src/design/App/UI/Sections/MyProjects/Steps/CreateProjectStep5View.axaml.cs
+++ b/src/design/App/UI/Sections/MyProjects/Steps/CreateProjectStep5View.axaml.cs
@@ -1,4 +1,6 @@
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using App.UI.Shared;
 using Avalonia.Controls.Shapes;
 using Avalonia.Interactivity;
 using ReactiveUI;
@@ -40,11 +42,50 @@ public partial class CreateProjectStep5View : UserControl
     private Button? _selectedDurationPresetBtn;
 
     private IDisposable? _durationValueSubscription;
+    private IDisposable? _layoutSubscription;
     private bool _handlersWired;
 
     public CreateProjectStep5View()
     {
         InitializeComponent();
+        SubscribeToLayoutMode();
+    }
+
+    /// <summary>Idempotent responsive-layout subscription — re-created on every logical-tree attach because OnDetachedFromLogicalTree disposes it (views are cached and re-attached on section switches).</summary>
+    private void SubscribeToLayoutMode()
+    {
+        if (_layoutSubscription != null) return;
+        _layoutSubscription = LayoutModeService.Instance
+            .WhenAnyValue(x => x.IsCompact)
+            .Subscribe(ApplyResponsiveLayout);
+    }
+
+    protected override void OnAttachedToLogicalTree(Avalonia.LogicalTree.LogicalTreeAttachmentEventArgs e)
+    {
+        base.OnAttachedToLogicalTree(e);
+        SubscribeToLayoutMode();
+    }
+
+    protected override void OnDetachedFromLogicalTree(Avalonia.LogicalTree.LogicalTreeAttachmentEventArgs e)
+    {
+        _layoutSubscription?.Dispose();
+        _layoutSubscription = null;
+        base.OnDetachedFromLogicalTree(e);
+    }
+
+    /// <summary>
+    /// Compact: the 4-item frequency row becomes a 2x2 fill grid; desktop keeps a
+    /// single full-width row. (Duration presets use BalancedWrapPanel in AXAML at
+    /// all breakpoints.)
+    /// </summary>
+    private void ApplyResponsiveLayout(bool isCompact)
+    {
+        var freq = this.FindControl<ListBox>("InvestFrequencyPresets");
+        if (freq != null)
+        {
+            freq.Classes.Set("Horizontal", !isCompact);
+            freq.Classes.Set("Grid2", isCompact);
+        }
     }
 
     protected override void OnLoaded(RoutedEventArgs e)
@@ -53,6 +94,7 @@ protected override void OnLoaded(RoutedEventArgs e)
         ResolveNamedElements();
         UpdatePayoutFreqVisuals();
         UpdateInstallmentVisuals();
+        ApplyResponsiveLayout(LayoutModeService.Instance.IsCompact);
 
         // Clear duration preset selection when user manually types a non-matching value,
         // or when the duration unit changes (items get regenerated)
diff --git a/src/design/App/UI/Sections/Portfolio/InvestmentDetailView.axaml b/src/design/App/UI/Sections/Portfolio/InvestmentDetailView.axaml
index 5af69dfb2..192e41f1b 100644
--- a/src/design/App/UI/Sections/Portfolio/InvestmentDetailView.axaml
+++ b/src/design/App/UI/Sections/Portfolio/InvestmentDetailView.axaml
@@ -1244,12 +1244,9 @@
                     BoxShadow="{DynamicResource ItemShadow}"
                     Padding="24">
                 <StackPanel Spacing="16">
-                    <!-- Header row — Vue: .card-header flex space-between.
-                         Grid (not DockPanel) so ApplyResponsiveLayout can drop the
-                         Recover button to its own full-width row on mobile instead
-                         of letting it overlay the title. -->
+                    <!-- Header row -->
                     <Grid Name="ScheduleHeaderGrid"
-                          ColumnDefinitions="*,Auto" RowDefinitions="Auto,Auto"
+                          ColumnDefinitions="*" RowDefinitions="Auto"
                           Margin="0,0,0,8">
                         <StackPanel Grid.Column="0" Grid.Row="0"
                                     Orientation="Horizontal" Spacing="12"
@@ -1268,34 +1265,6 @@
                                        Foreground="{DynamicResource TextStrongBrush}"
                                        VerticalAlignment="Center" />
                         </StackPanel>
-                        <!-- Recover Funds button — design-system green primary action.
-                             Dynamic text/icon based on PenaltyState: none→"Recover Funds", pending→"Claim Penalties", canRelease→"Release Funds" -->
-                        <Button Name="RecoverFundsButton"
-                                Grid.Column="1" Grid.Row="0"
-                                HorizontalAlignment="Right"
-                                HorizontalContentAlignment="Center"
-                                VerticalAlignment="Center"
-                                Height="44"
-                                Padding="20,0"
-                                CornerRadius="8"
-                                BorderThickness="0"
-                                IsVisible="{Binding ShowRecoverButton}"
-                                Cursor="Hand">
-                            <Button.Background>
-                                <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
-                                    <GradientStop Color="{StaticResource PrimaryGreen}" Offset="0" />
-                                    <GradientStop Color="#3D6448" Offset="1" />
-                                </LinearGradientBrush>
-                            </Button.Background>
-                            <StackPanel Orientation="Horizontal" Spacing="8">
-                                <i:Icon Value="{Binding PenaltyButtonIcon}" FontSize="14"
-                                        Foreground="White" VerticalAlignment="Center" />
-                                <TextBlock Text="{Binding PenaltyButtonText}"
-                                           FontSize="14"
-                                           FontWeight="SemiBold"
-                                           Foreground="White" />
-                            </StackPanel>
-                        </Button>
                     </Grid>
 
                     <!-- Desktop table view (hidden on mobile) -->
@@ -1512,6 +1481,36 @@
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
+
+                    <!-- Recover Funds button — full-width action at the bottom of the
+                         schedule card, below the stages (all breakpoints).
+                         Bitcoin-orange accent (original design), 52px MobileAction
+                         height on compact, content centred both axes.
+                         Dynamic text/icon based on PenaltyState: none→"Recover Funds", pending→"Claim Penalties", canRelease→"Release Funds" -->
+                    <Button Name="RecoverFundsButton"
+                            Classes="MobileAction"
+                            HorizontalAlignment="Stretch"
+                            HorizontalContentAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            MinHeight="44"
+                            Padding="20,0"
+                            Margin="0,8,0,0"
+                            CornerRadius="8"
+                            BorderThickness="0"
+                            Background="{DynamicResource BitcoinAccent}"
+                            IsVisible="{Binding ShowRecoverButton}"
+                            Cursor="Hand">
+                        <StackPanel Orientation="Horizontal" Spacing="8"
+                                    HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <i:Icon Value="{Binding PenaltyButtonIcon}" FontSize="14"
+                                    Foreground="White" VerticalAlignment="Center" />
+                            <TextBlock Text="{Binding PenaltyButtonText}"
+                                       FontSize="14"
+                                       FontWeight="SemiBold"
+                                       Foreground="White"
+                                       VerticalAlignment="Center" />
+                        </StackPanel>
+                    </Button>
                 </StackPanel>
             </Border>
 
diff --git a/src/design/App/UI/Sections/Portfolio/InvestmentDetailView.axaml.cs b/src/design/App/UI/Sections/Portfolio/InvestmentDetailView.axaml.cs
index 42d64eecf..eb137d952 100644
--- a/src/design/App/UI/Sections/Portfolio/InvestmentDetailView.axaml.cs
+++ b/src/design/App/UI/Sections/Portfolio/InvestmentDetailView.axaml.cs
@@ -41,8 +41,6 @@ public partial class InvestmentDetailView : UserControl
     private StackPanel? _stagesTableDesktop;
     private ItemsControl? _stagesCardsMobile;
     private StackPanel? _contentStack;
-    private Grid? _scheduleHeaderGrid;
-    private Button? _recoverFundsButton;
 
     public InvestmentDetailView()
     {
@@ -73,8 +71,6 @@ public InvestmentDetailView()
         _stagesTableDesktop = this.FindControl<StackPanel>("StagesTableDesktop");
         _stagesCardsMobile = this.FindControl<ItemsControl>("StagesCardsMobile");
         _contentStack = this.FindControl<StackPanel>("ContentStack");
-        _scheduleHeaderGrid = this.FindControl<Grid>("ScheduleHeaderGrid");
-        _recoverFundsButton = this.FindControl<Button>("RecoverFundsButton");
 
         SubscribeToLayoutMode();
     }
@@ -153,16 +149,6 @@ private void ApplyResponsiveLayout(bool isCompact)
             if (_stagesTableDesktop != null) _stagesTableDesktop.IsVisible = false;
             if (_stagesCardsMobile != null) _stagesCardsMobile.IsVisible = true;
 
-            // Recover button: drop to its own row, full width (stops it overlaying the title)
-            if (_recoverFundsButton != null)
-            {
-                Grid.SetColumn(_recoverFundsButton, 0);
-                Grid.SetRow(_recoverFundsButton, 1);
-                Grid.SetColumnSpan(_recoverFundsButton, 2);
-                _recoverFundsButton.HorizontalAlignment = Avalonia.Layout.HorizontalAlignment.Stretch;
-                _recoverFundsButton.Margin = new Thickness(0, 12, 0, 0);
-            }
-
             // Bottom padding for tab bar clearance
             if (_contentStack != null) _contentStack.Margin = new Thickness(0, 0, 0, 96);
         }
@@ -221,16 +207,6 @@ private void ApplyResponsiveLayout(bool isCompact)
             if (_stagesTableDesktop != null) _stagesTableDesktop.IsVisible = true;
             if (_stagesCardsMobile != null) _stagesCardsMobile.IsVisible = false;
 
-            // Recover button: back to the header's right column
-            if (_recoverFundsButton != null)
-            {
-                Grid.SetColumn(_recoverFundsButton, 1);
-                Grid.SetRow(_recoverFundsButton, 0);
-                Grid.SetColumnSpan(_recoverFundsButton, 1);
-                _recoverFundsButton.HorizontalAlignment = Avalonia.Layout.HorizontalAlignment.Right;
-                _recoverFundsButton.Margin = new Thickness(0);
-            }
-
             if (_contentStack != null) _contentStack.Margin = new Thickness(0);
         }
     }
@@ -462,7 +438,9 @@ private void OpenTransactionInBrowser()
     }
 
     /// <summary>
-    /// Load investor shares from the SDK and show the breakdown modal.
+    /// Show the breakdown modal immediately (optimistic, in a loading state),
+    /// then load investor shares from the SDK and populate it. On failure the
+    /// modal flips to an inline error state — never a silent no-op button.
     /// </summary>
     private async Task ShowInvestorBreakdownAsync()
     {
@@ -475,24 +453,23 @@ private async Task ShowInvestorBreakdownAsync()
         var projectAppService = App.Services.GetService<Angor.Sdk.Funding.Projects.IProjectAppService>();
         if (projectAppService == null) return;
 
-        var result = await projectAppService.GetInvestorShares(
-            new Angor.Sdk.Funding.Shared.ProjectId(investVm.ProjectIdentifier));
-
-        if (result.IsFailure) return;
-
         var currencyService = App.Services.GetService<ICurrencyService>();
         var currencySymbol = currencyService?.Symbol ?? "BTC";
 
-        var breakdownView = new InvestorBreakdownView
-        {
-            DataContext = new InvestorBreakdownViewModel(
-                result.Value,
-                investVm.ProjectName,
-                investVm.ProjectType,
-                currencySymbol,
-                investVm.InvestorPublicKey)
-        };
+        var breakdownVm = new InvestorBreakdownViewModel(
+            investVm.ProjectName,
+            investVm.ProjectType,
+            currencySymbol,
+            investVm.InvestorPublicKey);
+
+        shellVm.ShowModal(new InvestorBreakdownView { DataContext = breakdownVm });
 
-        shellVm.ShowModal(breakdownView);
+        var result = await projectAppService.GetInvestorShares(
+            new Angor.Sdk.Funding.Shared.ProjectId(investVm.ProjectIdentifier));
+
+        if (result.IsSuccess)
+            breakdownVm.ApplyData(result.Value);
+        else
+            breakdownVm.SetError();
     }
 }
diff --git a/src/design/App/UI/Sections/Portfolio/InvestorBreakdownView.axaml b/src/design/App/UI/Sections/Portfolio/InvestorBreakdownView.axaml
index bc0e89c45..036e5e8b4 100644
--- a/src/design/App/UI/Sections/Portfolio/InvestorBreakdownView.axaml
+++ b/src/design/App/UI/Sections/Portfolio/InvestorBreakdownView.axaml
@@ -8,222 +8,382 @@
              x:Class="App.UI.Sections.Portfolio.InvestorBreakdownView"
              x:DataType="portfolio:InvestorBreakdownViewModel">
 
+    <UserControl.Styles>
+        <!-- Kill FluentTheme chrome on modal buttons (house pattern, see RecoveryModalsView) -->
+        <Style Selector="Button.ModalBtn">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="Padding" Value="0" />
+        </Style>
+        <Style Selector="Button.ModalBtn:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Background" Value="Transparent" />
+        </Style>
+        <Style Selector="Button.ModalBtn:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Background" Value="Transparent" />
+        </Style>
+    </UserControl.Styles>
+
     <Border Classes="ModalCard Wide"
+            MaxHeight="{Binding $parent[Panel].Bounds.Height, FallbackValue=800}"
+            CornerRadius="16"
+            Background="{DynamicResource RecoveryModalBg}"
+            BorderBrush="{DynamicResource RecoveryModalBorder}"
+            BorderThickness="1"
+            BoxShadow="0 8 32 0 #40000000"
+            ClipToBounds="True"
             Padding="0">
         <DockPanel>
-            <!-- Footer: Close button -->
-            <Border DockPanel.Dock="Bottom"
-                    BorderBrush="{DynamicResource Stroke}"
-                    BorderThickness="0,1,0,0"
-                    Padding="24,16">
-                <Button Name="CloseButton"
-                        Classes="Primary"
-                        HorizontalAlignment="Center"
-                        Padding="32,10">
-                    <TextBlock Text="Close"
-                               FontSize="14"
-                               FontWeight="SemiBold" />
-                </Button>
-            </Border>
-
-            <!-- Content -->
-            <ScrollViewer VerticalScrollBarVisibility="Auto"
-                          HorizontalScrollBarVisibility="Disabled"
-                          MaxHeight="500">
-                <StackPanel Spacing="20" Margin="24">
 
-                    <!-- Header -->
-                    <StackPanel Spacing="8">
-                        <StackPanel Orientation="Horizontal" Spacing="12">
-                            <i:Icon Value="fa-solid fa-chart-pie"
-                                   FontSize="22"
+            <!-- ── Sticky header: icon + title + close X ── -->
+            <Border DockPanel.Dock="Top" Padding="24,20"
+                    BorderThickness="0,0,0,1"
+                    CornerRadius="15,15,0,0"
+                    BorderBrush="{DynamicResource ModalHeaderBorder}"
+                    Background="{DynamicResource RecoveryModalBg}">
+                <Panel>
+                    <StackPanel Spacing="4" VerticalAlignment="Center" Margin="0,0,40,0">
+                        <Grid ColumnDefinitions="Auto,12,*">
+                            <i:Icon Grid.Column="0"
+                                   Value="fa-solid fa-chart-pie"
+                                   FontSize="20"
                                    Foreground="{DynamicResource PrimaryGreenBrush}"
                                    VerticalAlignment="Center" />
-                            <TextBlock Text="Investor Breakdown"
+                            <TextBlock Grid.Column="2"
+                                       Text="Investor Breakdown"
                                        FontSize="20"
                                        FontWeight="Bold"
                                        Foreground="{DynamicResource TextStrong}"
+                                       TextTrimming="CharacterEllipsis"
                                        VerticalAlignment="Center" />
-                        </StackPanel>
+                        </Grid>
                         <TextBlock Text="{Binding ProjectName}"
+                                   FontSize="13"
+                                   Foreground="{DynamicResource TextMuted}"
+                                   TextTrimming="CharacterEllipsis" />
+                    </StackPanel>
+                    <Button Name="CloseButtonX" Classes="ModalBtn ModalCloseBtn"
+                            HorizontalAlignment="Right" VerticalAlignment="Top" />
+                </Panel>
+            </Border>
+
+            <!-- ── Sticky footer: full-width Close (52px tall on mobile via MobileAction) ── -->
+            <Border DockPanel.Dock="Bottom" Padding="24,16"
+                    BorderThickness="0,1,0,0"
+                    CornerRadius="0,0,15,15"
+                    BorderBrush="{DynamicResource ModalHeaderBorder}"
+                    Background="{DynamicResource RecoveryModalBg}">
+                <Button Name="CloseButton" Classes="ModalBtn MobileAction" Cursor="Hand"
+                        HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
+                    <Border CornerRadius="8" Padding="24,12" HorizontalAlignment="Stretch"
+                            Background="{DynamicResource ModalCancelBg}">
+                        <TextBlock Text="Close" FontSize="14" FontWeight="SemiBold"
+                                   Foreground="{DynamicResource ModalCancelFg}"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center"
+                                   TextAlignment="Center" />
+                    </Border>
+                </Button>
+            </Border>
+
+            <!-- ── Scrolling content ── -->
+            <ScrollViewer VerticalScrollBarVisibility="Auto"
+                          HorizontalScrollBarVisibility="Disabled">
+                <Panel Margin="24">
+
+                    <!-- LOADING state: shown while shares are being fetched (optimistic open) -->
+                    <StackPanel Spacing="12" IsVisible="{Binding IsLoading}"
+                                HorizontalAlignment="Center" VerticalAlignment="Center"
+                                MinHeight="160" Margin="0,48">
+                        <!-- Fixed-size container: the rotating icon's bounding box grows
+                             to ~34px mid-rotation and must not escape its parent -->
+                        <Panel Width="40" Height="40" HorizontalAlignment="Center">
+                            <i:Icon Value="fa-solid fa-spinner" FontSize="24"
+                                    Foreground="{DynamicResource PrimaryGreenBrush}"
+                                    HorizontalAlignment="Center" VerticalAlignment="Center"
+                                    RenderTransformOrigin="50%,50%">
+                                <i:Icon.RenderTransform><RotateTransform /></i:Icon.RenderTransform>
+                                <i:Icon.Styles>
+                                    <Style Selector="i|Icon[IsVisible=True]">
+                                        <Style.Animations>
+                                            <Animation Duration="0:0:1" IterationCount="INFINITE">
+                                                <KeyFrame Cue="0%"><Setter Property="RotateTransform.Angle" Value="0" /></KeyFrame>
+                                                <KeyFrame Cue="100%"><Setter Property="RotateTransform.Angle" Value="360" /></KeyFrame>
+                                            </Animation>
+                                        </Style.Animations>
+                                    </Style>
+                                </i:Icon.Styles>
+                            </i:Icon>
+                        </Panel>
+                        <TextBlock Text="Loading investor data..."
                                    FontSize="14"
-                                   Foreground="{DynamicResource TextMuted}" />
+                                   Foreground="{DynamicResource TextMuted}"
+                                   HorizontalAlignment="Center" />
                     </StackPanel>
 
-                    <!-- Summary stats -->
-                    <Grid ColumnDefinitions="*,*">
-                        <Border Grid.Column="0"
-                                Background="{DynamicResource SurfaceLow}"
-                                BorderBrush="{DynamicResource Stroke}"
-                                BorderThickness="1"
-                                CornerRadius="12"
-                                Padding="16"
-                                Margin="0,0,8,0">
-                            <StackPanel Spacing="4">
-                                <TextBlock Text="Total Invested"
-                                           FontSize="12"
-                                           Foreground="{DynamicResource TextMuted}" />
-                                <StackPanel Orientation="Horizontal" Spacing="4">
-                                    <TextBlock Text="{Binding TotalInvested}"
+                    <!-- ERROR state -->
+                    <StackPanel Spacing="12" IsVisible="{Binding HasError}"
+                                HorizontalAlignment="Center" VerticalAlignment="Center"
+                                MinHeight="160" Margin="0,48">
+                        <i:Icon Value="fa-solid fa-triangle-exclamation" FontSize="24"
+                                Foreground="{DynamicResource PillOrangeText}"
+                                HorizontalAlignment="Center" />
+                        <TextBlock Text="Could not load investor data. Please try again later."
+                                   FontSize="14"
+                                   Foreground="{DynamicResource TextMuted}"
+                                   TextWrapping="Wrap"
+                                   TextAlignment="Center"
+                                   HorizontalAlignment="Center" />
+                    </StackPanel>
+
+                    <!-- DATA state -->
+                    <StackPanel Spacing="20" IsVisible="{Binding HasData}">
+
+                        <!-- Summary stats -->
+                        <Grid Name="SummaryStatsGrid" ColumnDefinitions="*,16,*" RowDefinitions="Auto,Auto">
+                            <Border Name="StatCardInvested" Grid.Column="0" Grid.Row="0"
+                                    Background="{DynamicResource SurfaceLow}"
+                                    BorderBrush="{DynamicResource Stroke}"
+                                    BorderThickness="1"
+                                    CornerRadius="12"
+                                    Padding="16">
+                                <StackPanel Spacing="4">
+                                    <TextBlock Text="Total Invested"
+                                               FontSize="12"
+                                               Foreground="{DynamicResource TextMuted}" />
+                                    <StackPanel Orientation="Horizontal" Spacing="4">
+                                        <TextBlock Text="{Binding TotalInvested}"
+                                                   FontSize="18"
+                                                   FontWeight="Bold"
+                                                   Foreground="{DynamicResource TextStrong}" />
+                                        <TextBlock Text="{Binding CurrencySymbol}"
+                                                   FontSize="11"
+                                                   Foreground="{DynamicResource TextMuted}"
+                                                   VerticalAlignment="Bottom" Margin="0,0,0,1" />
+                                    </StackPanel>
+                                </StackPanel>
+                            </Border>
+                            <Border Name="StatCardInvestors" Grid.Column="2" Grid.Row="0"
+                                    Background="{DynamicResource SurfaceLow}"
+                                    BorderBrush="{DynamicResource Stroke}"
+                                    BorderThickness="1"
+                                    CornerRadius="12"
+                                    Padding="16">
+                                <StackPanel Spacing="4">
+                                    <TextBlock Text="Total Investors"
+                                               FontSize="12"
+                                               Foreground="{DynamicResource TextMuted}" />
+                                    <TextBlock Text="{Binding TotalInvestors}"
                                                FontSize="18"
                                                FontWeight="Bold"
                                                Foreground="{DynamicResource TextStrong}" />
-                                    <TextBlock Text="{Binding CurrencySymbol}"
-                                               FontSize="11"
-                                               Foreground="{DynamicResource TextMuted}"
-                                               VerticalAlignment="Bottom" Margin="0,0,0,1" />
                                 </StackPanel>
-                            </StackPanel>
-                        </Border>
-                        <Border Grid.Column="1"
-                                Background="{DynamicResource SurfaceLow}"
-                                BorderBrush="{DynamicResource Stroke}"
-                                BorderThickness="1"
-                                CornerRadius="12"
-                                Padding="16"
-                                Margin="8,0,0,0">
-                            <StackPanel Spacing="4">
-                                <TextBlock Text="Total Investors"
-                                           FontSize="12"
-                                           Foreground="{DynamicResource TextMuted}" />
-                                <TextBlock Text="{Binding TotalInvestors}"
-                                           FontSize="18"
-                                           FontWeight="Bold"
-                                           Foreground="{DynamicResource TextStrong}" />
-                            </StackPanel>
+                            </Border>
+                        </Grid>
+
+                        <!-- Context note for Fund projects -->
+                        <Border Background="{DynamicResource PillOrangeBg}"
+                                CornerRadius="8"
+                                Padding="12"
+                                IsVisible="{Binding IsFundType}">
+                            <!-- Grid (not horizontal StackPanel) so the wrapping note
+                                 text is width-constrained and cannot overflow -->
+                            <Grid ColumnDefinitions="Auto,*" ColumnSpacing="8">
+                                <i:Icon Grid.Column="0" Value="fa-solid fa-circle-info"
+                                       FontSize="14"
+                                       Foreground="{DynamicResource PillOrangeText}"
+                                       VerticalAlignment="Top" Margin="0,2,0,0" />
+                                <TextBlock Grid.Column="1" Text="{Binding ShareContextNote}"
+                                           FontSize="13"
+                                           Foreground="{DynamicResource TextMuted}"
+                                           TextWrapping="Wrap" />
+                            </Grid>
                         </Border>
-                    </Grid>
 
-                    <!-- Context note for Fund projects -->
-                    <Border Background="#1AF7931A"
-                            CornerRadius="8"
-                            Padding="12"
-                            IsVisible="{Binding IsFundType}">
-                        <StackPanel Orientation="Horizontal" Spacing="8">
-                            <i:Icon Value="fa-solid fa-circle-info"
-                                   FontSize="14"
-                                   Foreground="#F7931A"
-                                   VerticalAlignment="Top" Margin="0,2,0,0" />
-                            <TextBlock Text="{Binding ShareContextNote}"
-                                       FontSize="13"
-                                       Foreground="{DynamicResource TextMuted}"
-                                       TextWrapping="Wrap" />
-                        </StackPanel>
-                    </Border>
+                        <!-- ── Desktop table (hidden on mobile) ── -->
+                        <StackPanel Name="BreakdownTableDesktop" Spacing="12">
+                            <!-- Table header -->
+                            <Grid ColumnDefinitions="40,*,120,80,80"
+                                  Margin="0,4,0,0">
+                                <TextBlock Grid.Column="0" Text="#"
+                                           FontSize="12" FontWeight="SemiBold"
+                                           Foreground="{DynamicResource TextMuted}" />
+                                <TextBlock Grid.Column="1" Text="Investor"
+                                           FontSize="12" FontWeight="SemiBold"
+                                           Foreground="{DynamicResource TextMuted}" />
+                                <TextBlock Grid.Column="2" Text="Invested"
+                                           FontSize="12" FontWeight="SemiBold"
+                                           Foreground="{DynamicResource TextMuted}"
+                                           HorizontalAlignment="Right" />
+                                <TextBlock Grid.Column="3" Text="Share"
+                                           FontSize="12" FontWeight="SemiBold"
+                                           Foreground="{DynamicResource TextMuted}"
+                                           HorizontalAlignment="Right" />
+                                <TextBlock Grid.Column="4" Text="Claimed"
+                                           FontSize="12" FontWeight="SemiBold"
+                                           Foreground="{DynamicResource TextMuted}"
+                                           HorizontalAlignment="Right" />
+                            </Grid>
 
-                    <!-- Table header -->
-                    <Grid ColumnDefinitions="40,*,120,100,100"
-                          Margin="0,4,0,0">
-                        <TextBlock Grid.Column="0" Text="#"
-                                   FontSize="12" FontWeight="SemiBold"
-                                   Foreground="{DynamicResource TextMuted}" />
-                        <TextBlock Grid.Column="1" Text="Investor"
-                                   FontSize="12" FontWeight="SemiBold"
-                                   Foreground="{DynamicResource TextMuted}" />
-                        <TextBlock Grid.Column="2" Text="Invested"
-                                   FontSize="12" FontWeight="SemiBold"
-                                   Foreground="{DynamicResource TextMuted}"
-                                   HorizontalAlignment="Right" />
-                        <TextBlock Grid.Column="3" Text="Share"
-                                   FontSize="12" FontWeight="SemiBold"
-                                   Foreground="{DynamicResource TextMuted}"
-                                   HorizontalAlignment="Right" />
-                        <TextBlock Grid.Column="4" Text="Claimed"
-                                   FontSize="12" FontWeight="SemiBold"
-                                   Foreground="{DynamicResource TextMuted}"
-                                   HorizontalAlignment="Right" />
-                    </Grid>
+                            <Border Height="1" Background="{DynamicResource Stroke}" />
 
-                    <Border Height="1" Background="{DynamicResource Stroke}" />
+                            <!-- Investor rows -->
+                            <ItemsControl ItemsSource="{Binding Investors}">
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate x:DataType="portfolio:InvestorShareRowViewModel">
+                                        <Panel Margin="0,2">
+                                            <!-- Highlighted row for current user -->
+                                            <Border Padding="8,8"
+                                                    CornerRadius="8"
+                                                    Background="{DynamicResource TabBarPillActiveBg}"
+                                                    BorderBrush="{DynamicResource PrimaryGreenBrush}"
+                                                    BorderThickness="1.5"
+                                                    IsVisible="{Binding IsCurrentUser}">
+                                                <Grid ColumnDefinitions="40,*,120,80,80">
+                                                    <TextBlock Grid.Column="0" Text="{Binding Rank}"
+                                                               FontSize="13" FontWeight="Bold"
+                                                               Foreground="{DynamicResource PrimaryGreenBrush}"
+                                                               VerticalAlignment="Center" />
+                                                    <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
+                                                        <TextBlock Text="{Binding ShortKey}"
+                                                                   FontSize="13" FontWeight="Bold"
+                                                                   FontFamily="Consolas,Courier New,monospace"
+                                                                   Foreground="{DynamicResource TextStrong}"
+                                                                   TextTrimming="CharacterEllipsis" />
+                                                        <Border Background="{DynamicResource PrimaryGreenBrush}"
+                                                                CornerRadius="4"
+                                                                Padding="6,2">
+                                                            <TextBlock Text="You"
+                                                                       FontSize="10"
+                                                                       FontWeight="Bold"
+                                                                       Foreground="White" />
+                                                        </Border>
+                                                    </StackPanel>
+                                                    <TextBlock Grid.Column="2" Text="{Binding TotalInvested}"
+                                                               FontSize="13" FontWeight="Bold"
+                                                               Foreground="{DynamicResource TextStrong}"
+                                                               HorizontalAlignment="Right"
+                                                               VerticalAlignment="Center" />
+                                                    <TextBlock Grid.Column="3" Text="{Binding SharePercentage}"
+                                                               FontSize="13" FontWeight="Bold"
+                                                               Foreground="{DynamicResource PrimaryGreenBrush}"
+                                                               HorizontalAlignment="Right"
+                                                               VerticalAlignment="Center" />
+                                                    <TextBlock Grid.Column="4" Text="{Binding ClaimedPercentage}"
+                                                               FontSize="13" FontWeight="Bold"
+                                                               Foreground="{DynamicResource PillOrangeText}"
+                                                               HorizontalAlignment="Right"
+                                                               VerticalAlignment="Center" />
+                                                </Grid>
+                                            </Border>
+                                            <!-- Normal row for other investors -->
+                                            <Border Padding="8,8"
+                                                    BorderBrush="{DynamicResource Stroke}"
+                                                    BorderThickness="0,0,0,1"
+                                                    IsVisible="{Binding !IsCurrentUser}">
+                                                <Grid ColumnDefinitions="40,*,120,80,80">
+                                                    <TextBlock Grid.Column="0" Text="{Binding Rank}"
+                                                               FontSize="13"
+                                                               Foreground="{DynamicResource TextMuted}"
+                                                               VerticalAlignment="Center" />
+                                                    <TextBlock Grid.Column="1" Text="{Binding ShortKey}"
+                                                               FontSize="13"
+                                                               FontFamily="Consolas,Courier New,monospace"
+                                                               Foreground="{DynamicResource TextStrong}"
+                                                               VerticalAlignment="Center"
+                                                               TextTrimming="CharacterEllipsis" />
+                                                    <TextBlock Grid.Column="2" Text="{Binding TotalInvested}"
+                                                               FontSize="13"
+                                                               Foreground="{DynamicResource TextStrong}"
+                                                               HorizontalAlignment="Right"
+                                                               VerticalAlignment="Center" />
+                                                    <TextBlock Grid.Column="3" Text="{Binding SharePercentage}"
+                                                               FontSize="13" FontWeight="Bold"
+                                                               Foreground="{DynamicResource PrimaryGreenBrush}"
+                                                               HorizontalAlignment="Right"
+                                                               VerticalAlignment="Center" />
+                                                    <TextBlock Grid.Column="4" Text="{Binding ClaimedPercentage}"
+                                                               FontSize="13"
+                                                               Foreground="{DynamicResource PillOrangeText}"
+                                                               HorizontalAlignment="Right"
+                                                               VerticalAlignment="Center" />
+                                                </Grid>
+                                            </Border>
+                                        </Panel>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                        </StackPanel>
 
-                    <!-- Investor rows -->
-                    <ItemsControl ItemsSource="{Binding Investors}">
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate x:DataType="portfolio:InvestorShareRowViewModel">
-                                <Panel Margin="0,2">
-                                    <!-- Highlighted row for current user -->
-                                    <Border Padding="8,8"
-                                            CornerRadius="8"
-                                            Background="#1A4B7C5A"
-                                            BorderBrush="{DynamicResource PrimaryGreenBrush}"
-                                            BorderThickness="1.5"
-                                            IsVisible="{Binding IsCurrentUser}">
-                                        <Grid ColumnDefinitions="40,*,120,100,100">
-                                            <TextBlock Grid.Column="0" Text="{Binding Rank}"
-                                                       FontSize="13" FontWeight="Bold"
-                                                       Foreground="{DynamicResource PrimaryGreenBrush}"
-                                                       VerticalAlignment="Center" />
-                                            <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
-                                                <TextBlock Text="{Binding ShortKey}"
+                        <!-- ── Mobile cards (shown on compact; house pattern: table→cards) ── -->
+                        <ItemsControl Name="BreakdownCardsMobile" ItemsSource="{Binding Investors}" IsVisible="False">
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate x:DataType="portfolio:InvestorShareRowViewModel">
+                                    <Border Margin="0,0,0,10"
+                                            CornerRadius="10"
+                                            Padding="14,12"
+                                            Background="{DynamicResource SurfaceLow}"
+                                            BorderBrush="{DynamicResource Stroke}"
+                                            BorderThickness="1"
+                                            Classes.CurrentUserCard="{Binding IsCurrentUser}">
+                                        <Border.Styles>
+                                            <Style Selector="Border.CurrentUserCard">
+                                                <Setter Property="Background" Value="{DynamicResource TabBarPillActiveBg}" />
+                                                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryGreenBrush}" />
+                                                <Setter Property="BorderThickness" Value="1.5" />
+                                            </Style>
+                                        </Border.Styles>
+                                        <StackPanel Spacing="8">
+                                            <!-- Row 1: rank + key + You badge -->
+                                            <StackPanel Orientation="Horizontal" Spacing="8">
+                                                <TextBlock Text="{Binding Rank, StringFormat='#{0}'}"
                                                            FontSize="13" FontWeight="Bold"
+                                                           Foreground="{DynamicResource TextMuted}"
+                                                           VerticalAlignment="Center" />
+                                                <TextBlock Text="{Binding ShortKey}"
+                                                           FontSize="13" FontWeight="SemiBold"
                                                            FontFamily="Consolas,Courier New,monospace"
                                                            Foreground="{DynamicResource TextStrong}"
-                                                           TextTrimming="CharacterEllipsis" />
+                                                           TextTrimming="CharacterEllipsis"
+                                                           VerticalAlignment="Center" />
                                                 <Border Background="{DynamicResource PrimaryGreenBrush}"
-                                                        CornerRadius="4"
-                                                        Padding="6,2">
-                                                    <TextBlock Text="You"
-                                                               FontSize="10"
-                                                               FontWeight="Bold"
-                                                               Foreground="White" />
+                                                        CornerRadius="4" Padding="6,2"
+                                                        IsVisible="{Binding IsCurrentUser}"
+                                                        VerticalAlignment="Center">
+                                                    <TextBlock Text="You" FontSize="10" FontWeight="Bold" Foreground="White" />
                                                 </Border>
                                             </StackPanel>
-                                            <TextBlock Grid.Column="2" Text="{Binding TotalInvested}"
-                                                       FontSize="13" FontWeight="Bold"
-                                                       Foreground="{DynamicResource TextStrong}"
-                                                       HorizontalAlignment="Right"
-                                                       VerticalAlignment="Center" />
-                                            <TextBlock Grid.Column="3" Text="{Binding SharePercentage}"
-                                                       FontSize="13" FontWeight="Bold"
-                                                       Foreground="{DynamicResource PrimaryGreenBrush}"
-                                                       HorizontalAlignment="Right"
-                                                       VerticalAlignment="Center" />
-                                            <TextBlock Grid.Column="4" Text="{Binding ClaimedPercentage}"
-                                                       FontSize="13" FontWeight="Bold"
-                                                       Foreground="#F7931A"
-                                                       HorizontalAlignment="Right"
-                                                       VerticalAlignment="Center" />
-                                        </Grid>
-                                    </Border>
-                                    <!-- Normal row for other investors -->
-                                    <Border Padding="8,8"
-                                            BorderBrush="{DynamicResource Stroke}"
-                                            BorderThickness="0,0,0,1"
-                                            IsVisible="{Binding !IsCurrentUser}">
-                                        <Grid ColumnDefinitions="40,*,120,100,100">
-                                            <TextBlock Grid.Column="0" Text="{Binding Rank}"
-                                                       FontSize="13"
-                                                       Foreground="{DynamicResource TextMuted}"
-                                                       VerticalAlignment="Center" />
-                                            <TextBlock Grid.Column="1" Text="{Binding ShortKey}"
-                                                       FontSize="13"
-                                                       FontFamily="Consolas,Courier New,monospace"
-                                                       Foreground="{DynamicResource TextStrong}"
-                                                       VerticalAlignment="Center"
-                                                       TextTrimming="CharacterEllipsis" />
-                                            <TextBlock Grid.Column="2" Text="{Binding TotalInvested}"
-                                                       FontSize="13"
-                                                       Foreground="{DynamicResource TextStrong}"
-                                                       HorizontalAlignment="Right"
-                                                       VerticalAlignment="Center" />
-                                            <TextBlock Grid.Column="3" Text="{Binding SharePercentage}"
-                                                       FontSize="13" FontWeight="Bold"
-                                                       Foreground="{DynamicResource PrimaryGreenBrush}"
-                                                       HorizontalAlignment="Right"
-                                                       VerticalAlignment="Center" />
-                                            <TextBlock Grid.Column="4" Text="{Binding ClaimedPercentage}"
-                                                       FontSize="13"
-                                                       Foreground="#F7931A"
-                                                       HorizontalAlignment="Right"
-                                                       VerticalAlignment="Center" />
-                                        </Grid>
+                                            <!-- Row 2: invested -->
+                                            <Grid ColumnDefinitions="*,Auto">
+                                                <TextBlock Grid.Column="0" Text="Invested" FontSize="12"
+                                                           Foreground="{DynamicResource TextMuted}" />
+                                                <TextBlock Grid.Column="1" FontSize="13" FontWeight="SemiBold"
+                                                           Foreground="{DynamicResource TextStrong}">
+                                                    <Run Text="{Binding TotalInvested}" /><Run Text=" " /><Run Text="{Binding CurrencySymbol}" />
+                                                </TextBlock>
+                                            </Grid>
+                                            <!-- Row 3: share + claimed -->
+                                            <Grid ColumnDefinitions="*,Auto">
+                                                <TextBlock Grid.Column="0" Text="Share" FontSize="12"
+                                                           Foreground="{DynamicResource TextMuted}" />
+                                                <TextBlock Grid.Column="1" Text="{Binding SharePercentage}"
+                                                           FontSize="13" FontWeight="Bold"
+                                                           Foreground="{DynamicResource PrimaryGreenBrush}" />
+                                            </Grid>
+                                            <Grid ColumnDefinitions="*,Auto">
+                                                <TextBlock Grid.Column="0" Text="Claimed" FontSize="12"
+                                                           Foreground="{DynamicResource TextMuted}" />
+                                                <TextBlock Grid.Column="1" Text="{Binding ClaimedPercentage}"
+                                                           FontSize="13" FontWeight="SemiBold"
+                                                           Foreground="{DynamicResource PillOrangeText}" />
+                                            </Grid>
+                                        </StackPanel>
                                     </Border>
-                                </Panel>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
 
-                </StackPanel>
+                    </StackPanel>
+                </Panel>
             </ScrollViewer>
         </DockPanel>
     </Border>
diff --git a/src/design/App/UI/Sections/Portfolio/InvestorBreakdownView.axaml.cs b/src/design/App/UI/Sections/Portfolio/InvestorBreakdownView.axaml.cs
index 3208abe7c..2bc6e0852 100644
--- a/src/design/App/UI/Sections/Portfolio/InvestorBreakdownView.axaml.cs
+++ b/src/design/App/UI/Sections/Portfolio/InvestorBreakdownView.axaml.cs
@@ -1,21 +1,91 @@
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.LogicalTree;
 using Avalonia.VisualTree;
+using App.UI.Shared;
 using App.UI.Shell;
 
 namespace App.UI.Sections.Portfolio;
 
 public partial class InvestorBreakdownView : UserControl
 {
+    private StackPanel? _tableDesktop;
+    private ItemsControl? _cardsMobile;
+    private Grid? _summaryStatsGrid;
+    private Border? _statCardInvestors;
+    private IDisposable? _layoutSubscription;
+
     public InvestorBreakdownView()
     {
         InitializeComponent();
         AddHandler(Button.ClickEvent, OnButtonClick, RoutingStrategies.Bubble);
+        SubscribeToLayoutMode();
+    }
+
+    protected override void OnLoaded(RoutedEventArgs e)
+    {
+        base.OnLoaded(e);
+        _tableDesktop = this.FindControl<StackPanel>("BreakdownTableDesktop");
+        _cardsMobile = this.FindControl<ItemsControl>("BreakdownCardsMobile");
+        _summaryStatsGrid = this.FindControl<Grid>("SummaryStatsGrid");
+        _statCardInvestors = this.FindControl<Border>("StatCardInvestors");
+        ApplyResponsiveLayout(LayoutModeService.Instance.IsCompact);
+    }
+
+    /// <summary>Idempotent responsive-layout subscription — re-created on every logical-tree attach because OnDetachedFromLogicalTree disposes it.</summary>
+    private void SubscribeToLayoutMode()
+    {
+        if (_layoutSubscription != null) return;
+        _layoutSubscription = LayoutModeService.Instance
+            .WhenAnyValue(x => x.IsCompact)
+            .Subscribe(ApplyResponsiveLayout);
+    }
+
+    protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
+    {
+        base.OnAttachedToLogicalTree(e);
+        SubscribeToLayoutMode();
+    }
+
+    protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
+    {
+        _layoutSubscription?.Dispose();
+        _layoutSubscription = null;
+        base.OnDetachedFromLogicalTree(e);
+    }
+
+    /// <summary>
+    /// Compact: fixed-width table → stacked cards (house pattern, same as
+    /// InvestmentDetailView stages), and the two summary stat cards stack.
+    /// </summary>
+    private void ApplyResponsiveLayout(bool isCompact)
+    {
+        if (_tableDesktop != null) _tableDesktop.IsVisible = !isCompact;
+        if (_cardsMobile != null) _cardsMobile.IsVisible = isCompact;
+
+        if (_summaryStatsGrid == null || _statCardInvestors == null) return;
+        if (isCompact)
+        {
+            _summaryStatsGrid.ColumnDefinitions[1].Width = new GridLength(0);
+            _summaryStatsGrid.ColumnDefinitions[2].Width = new GridLength(0);
+            Grid.SetColumn(_statCardInvestors, 0);
+            Grid.SetRow(_statCardInvestors, 1);
+            _statCardInvestors.Margin = new Thickness(0, 12, 0, 0);
+        }
+        else
+        {
+            _summaryStatsGrid.ColumnDefinitions[1].Width = new GridLength(16);
+            _summaryStatsGrid.ColumnDefinitions[2].Width = GridLength.Star;
+            Grid.SetColumn(_statCardInvestors, 2);
+            Grid.SetRow(_statCardInvestors, 0);
+            _statCardInvestors.Margin = new Thickness(0);
+        }
     }
 
     private void OnButtonClick(object? sender, RoutedEventArgs e)
     {
-        if (e.Source is Button { Name: "CloseButton" })
+        if (e.Source is Button { Name: "CloseButton" or "CloseButtonX" })
         {
             var shellVm = this.FindAncestorOfType<ShellView>()?.DataContext as ShellViewModel;
             shellVm?.HideModal();
diff --git a/src/design/App/UI/Sections/Portfolio/InvestorBreakdownViewModel.cs b/src/design/App/UI/Sections/Portfolio/InvestorBreakdownViewModel.cs
index 02ea84367..64c92f1b3 100644
--- a/src/design/App/UI/Sections/Portfolio/InvestorBreakdownViewModel.cs
+++ b/src/design/App/UI/Sections/Portfolio/InvestorBreakdownViewModel.cs
@@ -24,16 +24,27 @@ public class InvestorShareRowViewModel
 /// <summary>
 /// ViewModel for the investor breakdown modal.
 /// Shows all investors in a project with their share percentages.
+///
+/// The modal opens optimistically: it is shown immediately in a loading state
+/// (IsLoading=true) while the share data is fetched, then populated via
+/// <see cref="ApplyData"/> — or flipped to an error state via <see cref="SetError"/>.
 /// </summary>
-public class InvestorBreakdownViewModel
+public partial class InvestorBreakdownViewModel : ReactiveObject
 {
     public string ProjectName { get; }
-    public string TotalInvested { get; }
-    public int TotalInvestors { get; }
     public string CurrencySymbol { get; }
     public string ProjectType { get; }
     public bool IsFundType { get; }
 
+    private readonly string _currentInvestorPublicKey;
+
+    [Reactive] private bool isLoading = true;
+    [Reactive] private bool hasError;
+    [Reactive] private string totalInvested = "0.00000000";
+    [Reactive] private int totalInvestors;
+
+    public bool HasData => !IsLoading && !HasError;
+
     /// <summary>
     /// Context note for Fund projects: "Shares are calculated as of now.
     /// New funds can always be added, which will change the percentages."
@@ -43,7 +54,6 @@ public class InvestorBreakdownViewModel
     public ObservableCollection<InvestorShareRowViewModel> Investors { get; } = new();
 
     public InvestorBreakdownViewModel(
-        GetInvestorShares.GetInvestorSharesResponse data,
         string projectName,
         string projectType,
         string currencySymbol,
@@ -53,14 +63,24 @@ public InvestorBreakdownViewModel(
         ProjectType = projectType;
         CurrencySymbol = currencySymbol;
         IsFundType = projectType == "fund";
-        TotalInvested = ((double)new Amount(data.TotalInvested).Sats.ToUnitBtc())
-            .ToString("F8", CultureInfo.InvariantCulture);
-        TotalInvestors = data.TotalInvestors;
+        _currentInvestorPublicKey = currentInvestorPublicKey;
 
         ShareContextNote = IsFundType
             ? "Shares are calculated as of now. New funds can always be added, which will change the percentages."
             : null;
 
+        this.WhenAnyValue(x => x.IsLoading, x => x.HasError)
+            .Subscribe(_ => this.RaisePropertyChanged(nameof(HasData)));
+    }
+
+    /// <summary>Populate the modal with fetched share data and leave the loading state.</summary>
+    public void ApplyData(GetInvestorShares.GetInvestorSharesResponse data)
+    {
+        TotalInvested = ((double)new Amount(data.TotalInvested).Sats.ToUnitBtc())
+            .ToString("F8", CultureInfo.InvariantCulture);
+        TotalInvestors = data.TotalInvestors;
+
+        Investors.Clear();
         int rank = 1;
         foreach (var investor in data.Investors)
         {
@@ -80,10 +100,20 @@ public InvestorBreakdownViewModel(
                 AmountClaimed = ((double)new Amount(investor.AmountClaimedByFounder).Sats.ToUnitBtc())
                     .ToString("F8", CultureInfo.InvariantCulture),
                 ClaimedPercentage = $"{investor.ClaimedPercentage:F2}%",
-                CurrencySymbol = currencySymbol,
-                IsCurrentUser = !string.IsNullOrEmpty(currentInvestorPublicKey)
-                    && string.Equals(key, currentInvestorPublicKey, StringComparison.OrdinalIgnoreCase)
+                CurrencySymbol = CurrencySymbol,
+                IsCurrentUser = !string.IsNullOrEmpty(_currentInvestorPublicKey)
+                    && string.Equals(key, _currentInvestorPublicKey, StringComparison.OrdinalIgnoreCase)
             });
         }
+
+        HasError = false;
+        IsLoading = false;
+    }
+
+    /// <summary>Flip the modal into its error state (fetch failed).</summary>
+    public void SetError()
+    {
+        HasError = true;
+        IsLoading = false;
     }
 }
diff --git a/src/design/App/UI/Shared/Controls/BalancedWrapPanel.cs b/src/design/App/UI/Shared/Controls/BalancedWrapPanel.cs
new file mode 100644
index 000000000..2cdb0b3b7
--- /dev/null
+++ b/src/design/App/UI/Shared/Controls/BalancedWrapPanel.cs
@@ -0,0 +1,115 @@
+using Avalonia;
+using Avalonia.Controls;
+
+namespace App.UI.Shared.Controls;
+
+/// <summary>
+/// Lays out children in rows of at most <see cref="MaxPerRow"/> items, distributing
+/// them so rows are as balanced as possible (5 items → 3+2, 6 → 3+3, 4 → 2+2),
+/// and stretches each row's children to share the full available width equally.
+///
+/// Used for preset-pill rows ("3/6/12/18/24 Months" etc.) so they divide the row
+/// nicely instead of hugging their content or leaving ragged gaps (issue #920 follow-up).
+/// </summary>
+public class BalancedWrapPanel : Panel
+{
+    public static readonly StyledProperty<int> MaxPerRowProperty =
+        AvaloniaProperty.Register<BalancedWrapPanel, int>(nameof(MaxPerRow), 3);
+
+    public static readonly StyledProperty<double> ColumnSpacingProperty =
+        AvaloniaProperty.Register<BalancedWrapPanel, double>(nameof(ColumnSpacing), 8);
+
+    public static readonly StyledProperty<double> RowSpacingProperty =
+        AvaloniaProperty.Register<BalancedWrapPanel, double>(nameof(RowSpacing), 8);
+
+    public int MaxPerRow
+    {
+        get => GetValue(MaxPerRowProperty);
+        set => SetValue(MaxPerRowProperty, value);
+    }
+
+    public double ColumnSpacing
+    {
+        get => GetValue(ColumnSpacingProperty);
+        set => SetValue(ColumnSpacingProperty, value);
+    }
+
+    public double RowSpacing
+    {
+        get => GetValue(RowSpacingProperty);
+        set => SetValue(RowSpacingProperty, value);
+    }
+
+    static BalancedWrapPanel()
+    {
+        AffectsMeasure<BalancedWrapPanel>(MaxPerRowProperty, ColumnSpacingProperty, RowSpacingProperty);
+    }
+
+    /// <summary>Items per row, balanced: e.g. 5 items / max 3 → [3, 2].</summary>
+    private int[] ComputeRows(int count)
+    {
+        if (count == 0) return Array.Empty<int>();
+        int maxPerRow = Math.Max(1, MaxPerRow);
+        int rows = (count + maxPerRow - 1) / maxPerRow;
+        int baseCount = count / rows;
+        int extra = count % rows;
+        var result = new int[rows];
+        for (int i = 0; i < rows; i++)
+            result[i] = baseCount + (i < extra ? 1 : 0);
+        return result;
+    }
+
+    protected override Size MeasureOverride(Size availableSize)
+    {
+        var visible = Children.Where(c => c.IsVisible).ToList();
+        var rows = ComputeRows(visible.Count);
+        double width = double.IsInfinity(availableSize.Width) ? 0 : availableSize.Width;
+        double totalHeight = 0;
+        int index = 0;
+
+        foreach (int itemsInRow in rows)
+        {
+            double cellWidth = width > 0
+                ? Math.Max(0, (width - ColumnSpacing * (itemsInRow - 1)) / itemsInRow)
+                : double.PositiveInfinity;
+            double rowHeight = 0;
+            for (int i = 0; i < itemsInRow; i++, index++)
+            {
+                visible[index].Measure(new Size(cellWidth, double.PositiveInfinity));
+                rowHeight = Math.Max(rowHeight, visible[index].DesiredSize.Height);
+            }
+            totalHeight += rowHeight;
+        }
+
+        if (rows.Length > 1)
+            totalHeight += RowSpacing * (rows.Length - 1);
+
+        return new Size(width, totalHeight);
+    }
+
+    protected override Size ArrangeOverride(Size finalSize)
+    {
+        var visible = Children.Where(c => c.IsVisible).ToList();
+        var rows = ComputeRows(visible.Count);
+        double y = 0;
+        int index = 0;
+
+        foreach (int itemsInRow in rows)
+        {
+            double cellWidth = Math.Max(0, (finalSize.Width - ColumnSpacing * (itemsInRow - 1)) / itemsInRow);
+            double rowHeight = 0;
+            for (int i = 0; i < itemsInRow; i++)
+                rowHeight = Math.Max(rowHeight, visible[index + i].DesiredSize.Height);
+
+            double x = 0;
+            for (int i = 0; i < itemsInRow; i++, index++)
+            {
+                visible[index].Arrange(new Rect(x, y, cellWidth, rowHeight));
+                x += cellWidth + ColumnSpacing;
+            }
+            y += rowHeight + RowSpacing;
+        }
+
+        return finalSize;
+    }
+}
diff --git a/src/design/App/UI/Shared/PaymentFlow/PaymentFlowView.axaml b/src/design/App/UI/Shared/PaymentFlow/PaymentFlowView.axaml
index 1bca11a65..28e378ee3 100644
--- a/src/design/App/UI/Shared/PaymentFlow/PaymentFlowView.axaml
+++ b/src/design/App/UI/Shared/PaymentFlow/PaymentFlowView.axaml
@@ -74,18 +74,21 @@
                         <Border CornerRadius="8" Padding="16"
                                 Background="{DynamicResource DeployModalInputBg}"
                                 BorderBrush="{DynamicResource DeployModalBorder}" BorderThickness="1">
-                            <Panel>
-                                <TextBlock Text="{Binding Title}"
+                            <!-- Grid (not Panel) so title and amount can never overlap
+                                 on narrow widths (issue #920) -->
+                            <Grid ColumnDefinitions="*,Auto" ColumnSpacing="12">
+                                <TextBlock Grid.Column="0" Text="{Binding Title}"
                                            FontSize="14" FontWeight="Medium"
                                            Foreground="{DynamicResource TextMuted}"
+                                           TextWrapping="Wrap"
                                            VerticalAlignment="Center"
                                            HorizontalAlignment="Left" />
-                                <TextBlock Text="{Binding AmountDisplay}"
+                                <TextBlock Grid.Column="1" Text="{Binding AmountDisplay}"
                                            FontSize="18" FontWeight="Bold"
                                            Foreground="{DynamicResource TextStrong}"
                                            VerticalAlignment="Center"
                                            HorizontalAlignment="Right" />
-                            </Panel>
+                            </Grid>
                         </Border>
                     </StackPanel>
                 </Border>
@@ -173,7 +176,7 @@
                 <!-- Wallet list -->
                 <ScrollViewer VerticalScrollBarVisibility="Auto">
                     <StackPanel Margin="24" Spacing="0">
-                        <ItemsControl ItemsSource="{Binding Wallets}">
+                        <ItemsControl Name="WalletsList" ItemsSource="{Binding Wallets}">
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate x:DataType="services:WalletInfo">
                                     <Button Name="WalletButton" Classes="Unstyled WalletCard"
@@ -184,7 +187,10 @@
                                             Cursor="Hand"
                                             HorizontalContentAlignment="Stretch"
                                             CommandParameter="{Binding}">
-                                        <Grid ColumnDefinitions="Auto,*,Auto">
+                                        <!-- One-column stack: name/type row, then balance row —
+                                             prevents the name/type wrapping char-by-char next to
+                                             a long balance on narrow widths (issue #920) -->
+                                        <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="12">
                                             <Border Grid.Column="0" Width="40" Height="40"
                                                     CornerRadius="8"
                                                     Background="{DynamicResource DeployWalletIconBg}"
@@ -194,36 +200,33 @@
                                                        Foreground="#f59e0b" />
                                             </Border>
                                             <StackPanel Grid.Column="1" Spacing="2"
-                                                        VerticalAlignment="Center" Margin="12,0,0,0">
+                                                        VerticalAlignment="Center">
                                                 <TextBlock Text="{Binding Name}"
                                                            FontSize="14" FontWeight="SemiBold"
+                                                           TextTrimming="CharacterEllipsis"
                                                            Foreground="{DynamicResource TextStrong}" />
-                                                <TextBlock Text="{Binding WalletType}"
-                                                           FontSize="13"
-                                                           Foreground="{DynamicResource TextMuted}" />
-                                            </StackPanel>
-                                            <StackPanel Grid.Column="2" Spacing="2"
-                                                        VerticalAlignment="Center"
-                                                        HorizontalAlignment="Right">
-                                                <StackPanel Orientation="Horizontal" Spacing="8">
+                                                <WrapPanel Orientation="Horizontal" ItemSpacing="8" LineSpacing="2">
+                                                    <TextBlock Text="{Binding WalletType}"
+                                                               FontSize="13"
+                                                               Foreground="{DynamicResource TextMuted}"
+                                                               VerticalAlignment="Center" />
                                                     <TextBlock Text="{Binding Balance}"
-                                                               FontSize="14" FontWeight="SemiBold"
+                                                               FontSize="13" FontWeight="SemiBold"
                                                                Foreground="{DynamicResource TextStrong}"
                                                                VerticalAlignment="Center" />
-                                                    <Viewbox Width="20" Height="20"
-                                                             IsVisible="{Binding IsSelected}"
-                                                             VerticalAlignment="Center">
-                                                        <Path Data="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z"
-                                                              Fill="{DynamicResource PrimaryGreenBrush}"
-                                                              Width="20" Height="20" Stretch="Uniform" />
-                                                    </Viewbox>
-                                                </StackPanel>
+                                                </WrapPanel>
                                                 <TextBlock Text="{Binding PendingBalance, StringFormat='Pending: {0}'}"
                                                            IsVisible="{Binding HasPendingBalance}"
                                                            FontSize="11"
-                                                           Foreground="#f59e0b"
-                                                           HorizontalAlignment="Right" />
+                                                           Foreground="#f59e0b" />
                                             </StackPanel>
+                                            <Viewbox Grid.Column="2" Width="20" Height="20"
+                                                     IsVisible="{Binding IsSelected}"
+                                                     VerticalAlignment="Center">
+                                                <Path Data="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z"
+                                                      Fill="{DynamicResource PrimaryGreenBrush}"
+                                                      Width="20" Height="20" Stretch="Uniform" />
+                                            </Viewbox>
                                         </Grid>
                                     </Button>
                                 </DataTemplate>
diff --git a/src/design/App/UI/Themes/V2/Controls/ListBox.axaml b/src/design/App/UI/Themes/V2/Controls/ListBox.axaml
index 3bff53649..3b826dd3f 100644
--- a/src/design/App/UI/Themes/V2/Controls/ListBox.axaml
+++ b/src/design/App/UI/Themes/V2/Controls/ListBox.axaml
@@ -14,7 +14,32 @@
             </Setter.Value>
         </Setter>
     </Style>
+
+    <!-- Like Horizontal, but items keep their natural width and wrap to the next
+         line when the container is too narrow (mobile). Prevents the char-by-char
+         text wrapping seen with UniformGrid on compact widths (issue #920). -->
+    <Style Selector=":is(ItemsControl).HorizontalWrap">
+        <Setter Property="ItemsPanel">
+            <Setter.Value>
+                <ItemsPanelTemplate>
+                    <WrapPanel Orientation="Horizontal" ItemSpacing="10" LineSpacing="10" />
+                </ItemsPanelTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
     
+    <!-- Two-column fill grid: items stretch to share the row equally and wrap
+         into balanced rows. Used for 4-item preset rows on compact widths. -->
+    <Style Selector=":is(ItemsControl).Grid2">
+        <Setter Property="ItemsPanel">
+            <Setter.Value>
+                <ItemsPanelTemplate>
+                    <UniformGrid Columns="2" ColumnSpacing="10" RowSpacing="10" />
+                </ItemsPanelTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <Style Selector=":is(ItemsControl).Vertical">
         <Setter Property="ItemsPanel">
             <Setter.Value>
@@ -39,10 +64,16 @@
         
         <ControlTheme x:Key="ButtonizedListBoxItem" TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
             <Setter Property="Padding" Value="10"></Setter>
-            <Setter Property="Background" Value="{DynamicResource SurfaceHover}" />
+            <!-- Standard preset-pill height: every preset pill matches the
+                 two-line target-amount pills so mixed rows align. -->
+            <Setter Property="MinHeight" Value="60" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <!-- Transparent + Stroke outline (matches DurPresetBtn); the old
+                 SurfaceHover fill read as a washed-out grey pill in dark mode -->
+            <Setter Property="Background" Value="Transparent" />
             <Setter Property="Foreground" Value="{DynamicResource TextStrong}" />
             <Setter Property="BorderThickness" Value="1" />
-            <Setter Property="BorderBrush" Value="Transparent" />
+            <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
             
             <Setter Property="CornerRadius" Value="10" />
 
@@ -60,10 +91,14 @@
         <ControlTheme x:Key="ButtonizedAccentListBoxItem" TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
             <Setter Property="Padding" Value="10" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Background" Value="{DynamicResource SurfaceHover}" />
+            <!-- Standard preset-pill height (see ButtonizedListBoxItem) -->
+            <Setter Property="MinHeight" Value="60" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <!-- Transparent + Stroke outline (matches DurPresetBtn) -->
+            <Setter Property="Background" Value="Transparent" />
             <Setter Property="Foreground" Value="{DynamicResource TextStrong}" />
             <Setter Property="BorderThickness" Value="1" />
-            <Setter Property="BorderBrush" Value="{DynamicResource Border}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
             <Setter Property="CornerRadius" Value="10" />
 
             <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">